Commit c474e348 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Linus Walleij

gpio: generic: make bgpio_pdata always visible

Board files that define their own bgpio_pdata are broken when
CONFIG_GPIO_GENERIC is disabled and the bgpio_pdata structure
definition is hidden by the #ifdef:

arch/arm/mach-clps711x/board-autcpu12.c:148:15: error: variable 'autcpu12_mmgpio_pdata' has initializer but incomplete type
 static struct bgpio_pdata autcpu12_mmgpio_pdata __initdata = {
arch/arm/mach-clps711x/board-autcpu12.c:149:2: error: unknown field 'base' specified in initializer
  .base = AUTCPU12_MMGPIO_BASE,

Since the board files should generally not care what drivers are
enabled, this makes the structure definition visible again.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: 0f4630f3 ("gpio: generic: factor into gpio_chip struct")
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 96098df1
...@@ -220,14 +220,14 @@ static inline void *gpiochip_get_data(struct gpio_chip *chip) ...@@ -220,14 +220,14 @@ static inline void *gpiochip_get_data(struct gpio_chip *chip)
struct gpio_chip *gpiod_to_chip(const struct gpio_desc *desc); struct gpio_chip *gpiod_to_chip(const struct gpio_desc *desc);
#if IS_ENABLED(CONFIG_GPIO_GENERIC)
struct bgpio_pdata { struct bgpio_pdata {
const char *label; const char *label;
int base; int base;
int ngpio; int ngpio;
}; };
#if IS_ENABLED(CONFIG_GPIO_GENERIC)
int bgpio_init(struct gpio_chip *gc, struct device *dev, int bgpio_init(struct gpio_chip *gc, struct device *dev,
unsigned long sz, void __iomem *dat, void __iomem *set, unsigned long sz, void __iomem *dat, void __iomem *set,
void __iomem *clr, void __iomem *dirout, void __iomem *dirin, void __iomem *clr, void __iomem *dirout, void __iomem *dirin,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment