michaelh/zephyr
1
0
Fork 0
Code Releases Activity

soc: apollo_lake: fix build errors for GPIO due to DTS changes

Browse source 
The DTS changes introduced in 7ae220c845
changes the naming of GPIO related macros. This updates the usage
of previous macros via DTS fixup.

Fixes #10993

Signed-off-by: Daniel Leung <daniel.leung@intel.com>
This commit is contained in:
Daniel Leung 2018-11-01 10:34:10 -07:00 • committed by Kumar Gala
commit a87a6d82ac
4 changed files with 33 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

16
drivers/gpio/gpio_intel_apl.c
View file

@ -430,22 +430,22 @@ static const struct gpio_intel_apl_config gpio_intel_apl_cfg = {
.islands = {
{
/* North island */
.reg_base = INTEL_APL_GPIO_0_BASE_ADDRESS_0,
.reg_base = CONFIG_APL_GPIO_BASE_ADDRESS_0,
.num_pins = 78,
},
{
/* Northwest island */
.reg_base = INTEL_APL_GPIO_0_BASE_ADDRESS_1,
.reg_base = CONFIG_APL_GPIO_BASE_ADDRESS_1,
.num_pins = 77,
},
{
/* West island */
.reg_base = INTEL_APL_GPIO_0_BASE_ADDRESS_2,
.reg_base = CONFIG_APL_GPIO_BASE_ADDRESS_2,
.num_pins = 47,
},
{
/* Southwest island */
.reg_base = INTEL_APL_GPIO_0_BASE_ADDRESS_3,
.reg_base = CONFIG_APL_GPIO_BASE_ADDRESS_3,
.num_pins = 43,
},
},
@ -453,7 +453,7 @@ static const struct gpio_intel_apl_config gpio_intel_apl_cfg = {
static struct gpio_intel_apl_data gpio_intel_apl_data;
DEVICE_AND_API_INIT(gpio_intel_apl, INTEL_APL_GPIO_0_LABEL,
DEVICE_AND_API_INIT(gpio_intel_apl, CONFIG_APL_GPIO_LABEL,
gpio_intel_apl_init,
&gpio_intel_apl_data, &gpio_intel_apl_cfg,
POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
@ -461,9 +461,9 @@ DEVICE_AND_API_INIT(gpio_intel_apl, INTEL_APL_GPIO_0_LABEL,
static void gpio_intel_apl_irq_config(struct device *dev)
{
IRQ_CONNECT(INTEL_APL_GPIO_0_IRQ_0, INTEL_APL_GPIO_0_IRQ_0_PRIORITY,
IRQ_CONNECT(CONFIG_APL_GPIO_IRQ, CONFIG_APL_GPIO_IRQ_PRIORITY,
gpio_intel_apl_isr, DEVICE_GET(gpio_intel_apl),
INTEL_APL_GPIO_0_IRQ_0_SENSE);
CONFIG_APL_GPIO_IRQ_SENSE);
irq_enable(INTEL_APL_GPIO_0_IRQ_0);
irq_enable(CONFIG_APL_GPIO_IRQ);
}