gpio: fix up CONFIG_OF dependencies
Subsystems (4)
PATCH 1/1 gpio: fix up CONFIG_OF dependencies
From: Arnd Bergmann <[email protected]>
A number of GPIO drivers that used to have a CONFIG_OF_GPIO dependency now fail to build on targets without CONFIG_OF:
WARNING: unmet direct dependencies detected for GPIO_SYSCON
Depends on [n]: GPIOLIB [=y] && HAS_IOMEM [=y] && MFD_SYSCON [=y] && OF [=n]
Selected by [y]:
- GPIO_SAMA5D2_PIOBU [=y] && GPIOLIB [=y] && HAS_IOMEM [=y] && MFD_SYSCON [=y] && (ARCH_AT91 || COMPILE_TEST [=y])
drivers/gpio/gpio-mt7621.c: In function 'mediatek_gpio_bank_probe':drivers/gpio/gpio-mt7621.c:254:20: error: 'struct gpio_chip' has no member named 'of_gpio_n_cells'
254 | rg->chip.gc.of_gpio_n_cells = 2;
| ^drivers/gpio/gpio-tegra186.c: In function 'tegra186_gpio_of_xlate':drivers/gpio/gpio-tegra186.c:502:25: error: 'struct gpio_chip' has no member named 'of_gpio_n_cells'
502 | if (WARN_ON(chip->of_gpio_n_cells < 2))
| ^~drivers/gpio/gpio-lpc32xx.c: In function 'lpc32xx_gpio_probe':drivers/gpio/gpio-lpc32xx.c:523:49: error: 'struct gpio_chip' has no member named 'of_xlate'
523 | lpc32xx_gpiochip[i].chip.of_xlate = lpc32xx_of_xlate;
| ^drivers/gpio/gpio-spacemit-k1.c: In function 'spacemit_gpio_add_bank':drivers/gpio/gpio-spacemit-k1.c:234:11: error: 'struct gpio_chip' has no member named 'of_gpio_n_cells'
234 | gc->of_gpio_n_cells = 3;
| ^~
Bring that back as a dependency.
---
There may be more fallout from the change, this is just what I found immediately, but you could already fold the changes into the broken patch while I look for additional ones.
--- drivers/gpio/Kconfig | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpio/Kconfig +6 -0
@@ -236,6 +236,7 @@ config GPIO_BRCMSTB tristate "BRCMSTB GPIO support" default y if (ARCH_BRCMSTB || BMIPS_GENERIC) depends on ARCH_BRCMSTB || ARCH_BCM2835 || BMIPS_GENERIC || COMPILE_TEST + depends on OF select GPIO_GENERIC select IRQ_DOMAIN help
@@ -450,6 +451,7 @@ config GPIO_LPC18XX config GPIO_LPC32XX tristate "NXP LPC32XX GPIO support" depends on ARCH_LPC32XX || COMPILE_TEST + depends on OF help Select this option to enable GPIO driver for NXP LPC32XX devices.
@@ -492,6 +494,7 @@ config GPIO_MPC8XXX config GPIO_MT7621 bool "Mediatek MT7621 GPIO Support" depends on SOC_MT7620 || SOC_MT7621 || COMPILE_TEST + depends on OF select GPIO_GENERIC select GPIOLIB_IRQCHIP help
@@ -632,6 +635,7 @@ config GPIO_RTD config GPIO_SAMA5D2_PIOBU tristate "SAMA5D2 PIOBU GPIO support" + depends on OF depends on MFD_SYSCON depends on ARCH_AT91 || COMPILE_TEST select GPIO_SYSCON
@@ -672,6 +676,7 @@ config GPIO_SNPS_CREG config GPIO_SPACEMIT_K1 tristate "SPACEMIT K1 GPIO support" depends on ARCH_SPACEMIT || COMPILE_TEST + depends on OF select GPIO_GENERIC select GPIOLIB_IRQCHIP help
@@ -737,6 +742,7 @@ config GPIO_TEGRA186 tristate "NVIDIA Tegra186 GPIO support" default ARCH_TEGRA_186_SOC || ARCH_TEGRA_194_SOC || ARCH_TEGRA_234_SOC depends on ARCH_TEGRA_186_SOC || ARCH_TEGRA_194_SOC || ARCH_TEGRA_234_SOC || COMPILE_TEST + depends on OF select GPIOLIB_IRQCHIP select IRQ_DOMAIN_HIERARCHY help
Signature · 1 line
2.39.5
Bartosz Golaszewski
maintainerQuoted 29 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
A number of GPIO drivers that used to have a
CONFIG_OF_GPIOdependency now fail to build on targets withoutCONFIG_OF:WARNING: unmet direct dependencies detected for
GPIO_SYSCON
Depends on [n]: GPIOLIB [=y] &&HAS_IOMEM[=y] &&MFD_SYSCON[=y] && OF [=n]
Selected by [y]:
-GPIO_SAMA5D2_PIOBU[=y] && GPIOLIB [=y] &&HAS_IOMEM[=y] &&MFD_SYSCON[=y] && (ARCH_AT91||COMPILE_TEST[=y])
drivers/gpio/gpio-mt7621.c: In function 'mediatek_gpio_bank_probe':drivers/gpio/gpio-mt7621.c:254:20: error: 'structgpio_chip' has no member named 'of_gpio_n_cells'
254 |rg->chip.gc.of_gpio_n_cells= 2;
| ^drivers/gpio/gpio-tegra186.c: In function 'tegra186_gpio_of_xlate':drivers/gpio/gpio-tegra186.c:502:25: error: 'structgpio_chip' has no member named 'of_gpio_n_cells'
502 | if (WARN_ON(chip->of_gpio_n_cells < 2))
| ^~drivers/gpio/gpio-lpc32xx.c: In function 'lpc32xx_gpio_probe':drivers/gpio/gpio-lpc32xx.c:523:49: error: 'structgpio_chip' has no member named 'of_xlate'
523 | lpc32xx_gpiochip[i].chip.of_xlate =lpc32xx_of_xlate;
| ^drivers/gpio/gpio-spacemit-k1.c: In function 'spacemit_gpio_add_bank':drivers/gpio/gpio-spacemit-k1.c:234:11: error: 'structgpio_chip' has no member named 'of_gpio_n_cells'
234 |gc->of_gpio_n_cells= 3;
| ^~Bring that back as a dependency.
Quoted 7 lines
Fixes 7803501e5754 ("gpio: drop unneeded Kconfig dependencies on OF_GPIO")Signed-off-by Arnd Bergmann <[email protected]>---
There may be more fallout from the change, this is just what I found immediately, but you could already fold the changes into the broken patch while I look for additional ones.
---
Thanks and sorry for the breakage. However, I'm wondering if it wouldn't make sense to do the following:
include/linux/gpio/driver.h +0 -2
@@ -473,7 +473,6 @@ struct gpio_chip {struct gpio_irq_chip irq;#endif /* CONFIG_GPIOLIB_IRQCHIP */ -#if defined(CONFIG_OF_GPIO )/* * If CONFIG_OF_GPIO is enabled, then all GPIO controllers described in * the device tree automatically may have an OF translation
@@ -516,7 +515,6 @@ struct gpio_chip {*/ int (*of_xlate)(struct gpio_chip *gc,const struct of_phandle_args *gpiospec,u32 *flags); -#endif /* CONFIG_OF_GPIO */ };char *gpiochip_dup_line_label (struct gpio_chip *gc,unsigned int offset);
Symbols from linux/of.h are stubbed out and these drivers can build just fine with !CONFIG_OF. This would naturally increase the build coverage.
Bartosz
Quoted 16 lines · Bartosz Golaszewski
Quoted 6 lines · Arnd Bergmann
WARNING: unmet direct dependencies detected for
GPIO_SYSCON
Depends on [n]: GPIOLIB [=y] &&HAS_IOMEM[=y] &&MFD_SYSCON[=y] && OF [=n]
Selected by [y]:
-GPIO_SAMA5D2_PIOBU[=y] && GPIOLIB [=y] &&HAS_IOMEM[=y] &&MFD_SYSCON[=y] && (ARCH_AT91||COMPILE_TEST[=y])Thanks and sorry for the breakage. However, I'm wondering if it wouldn't make sense to do the following:
include/linux/gpio/driver.h +0
-1-#if defined(CONFIG_OF_GPIO )/* * If CONFIG_OF_GPIO is enabled, then all GPIO controllers described in * the device tree automatically may have an OF translation
...
Quoted 2 lines
Symbols from
linux/of.hare stubbed out and these drivers can build just fine with !CONFIG_OF. This would naturally increase the build coverage.
I don't think we need to worry about the build coverage here, CONFIG_OF is still included in x86 allmodconfig and half the randconfig builds, so the drivers get enough exposure either way.
On the other hand, dropping the build time check may help avoid future Kconfig dependency issues, so that still sounds like a reasonable suggestion. At least CONFIG_GPIO_SAMA5D2_PIOBU is going to need the 'depends on OF' regardless though to work around the other build error I cited above.
Arnd
Bartosz Golaszewski
maintainerQuoted 26 lines · Arnd Bergmann
Quoted 16 lines · Bartosz Golaszewski
Quoted 6 lines · Arnd Bergmann
WARNING: unmet direct dependencies detected for
GPIO_SYSCON
Depends on [n]: GPIOLIB [=y] &&HAS_IOMEM[=y] &&MFD_SYSCON[=y] && OF [=n]
Selected by [y]:
-GPIO_SAMA5D2_PIOBU[=y] && GPIOLIB [=y] &&HAS_IOMEM[=y] &&MFD_SYSCON[=y] && (ARCH_AT91||COMPILE_TEST[=y])Thanks and sorry for the breakage. However, I'm wondering if it wouldn't make sense to do the following:
-#if
defined(CONFIG_OF_GPIO)
/*
* IfCONFIG_OF_GPIOis enabled, then all GPIO controllers described in
* the device tree automatically may have an OF translation...
Quoted 2 lines
Symbols from
linux/of.hare stubbed out and these drivers can build just fine with !CONFIG_OF. This would naturally increase the build coverage.I don't think we need to worry about the build coverage here,
CONFIG_OFis still included in x86 allmodconfig and half the randconfig builds, so the drivers get enough exposure either way.
Quoted 7 lines
On the other hand, dropping the build time check may help avoid future
Kconfigdependency issues, so that still sounds like a reasonable suggestion. At leastCONFIG_GPIO_SAMA5D2_PIOBUis going to need the 'depends on OF' regardless though to work around the other build error I cited above.Arnd
Fair enough, I'll queue this patch.
Bart
Bartosz Golaszewski
AppliedQuoted 9 lines · Arnd Bergmann
A number of GPIO drivers that used to have a
CONFIG_OF_GPIOdependency now fail to build on targets withoutCONFIG_OF:WARNING: unmet direct dependencies detected for
GPIO_SYSCON
Depends on [n]: GPIOLIB [=y] &&HAS_IOMEM[=y] &&MFD_SYSCON[=y] && OF [=n]
Selected by [y]:
-GPIO_SAMA5D2_PIOBU[=y] && GPIOLIB [=y] &&HAS_IOMEM[=y] &&MFD_SYSCON[=y] && (ARCH_AT91||COMPILE_TEST[=y])[...]
Applied, thanks!
[1/1] gpio: fix up CONFIG_OF dependencies
https://git.kernel.org/brgl/c/af475c16bc02a08ed6af6ca0c920f98a45611fe6
Best regards,
Signature · 1 line
Bartosz Golaszewski <[email protected]>