| Message ID | ZpH12w9vyZZDdzDb@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | dead06c5e110c25931bafc8cf017e3077b871ac5 |
| Headers | show |
| Series | ARM: pxa: fix build breakage on PXA3xx | expand |
Hello: This patch was applied to soc/soc.git (for-next) by Arnd Bergmann <arnd@arndb.de>: On Fri, 12 Jul 2024 20:34:51 -0700 you wrote: > Commit 917195d6f829 ("ARM: pxa: consolidate GPIO chip platform data") > tried to reuse the same instance of platform data for PXA25x and PXA27x > GPIO controllers by moving it into arch/arm/mach-pxa/devices.c > Unfortunately this file is built for other PXA variants which resulted > in the following error: > > >> arm-linux-gnueabi-ld: arch/arm/mach-pxa/devices.o:(.data+0x167c): undefined reference to `gpio_set_wake' > > [...] Here is the summary with links: - ARM: pxa: fix build breakage on PXA3xx https://git.kernel.org/soc/soc/c/dead06c5e110 You are awesome, thank you!
diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c index d050a4c78f97..7695cfce01a1 100644 --- a/arch/arm/mach-pxa/devices.c +++ b/arch/arm/mach-pxa/devices.c @@ -633,6 +633,7 @@ struct platform_device pxa27x_device_pwm1 = { }; #endif /* CONFIG_PXA27x || CONFIG_PXA3xx */ +#if defined(CONFIG_PXA25x) || defined(CONFIG_PXA27x) const struct software_node pxa2xx_gpiochip_node = { .name = "gpio-pxa", }; @@ -684,6 +685,7 @@ struct platform_device pxa27x_device_gpio = { .platform_data = &pxa2xx_gpio_info, }, }; +#endif /* CONFIG_PXA25x || CONFIG_PXA27x */ static struct resource pxa_dma_resource[] = { [0] = {
Commit 917195d6f829 ("ARM: pxa: consolidate GPIO chip platform data") tried to reuse the same instance of platform data for PXA25x and PXA27x GPIO controllers by moving it into arch/arm/mach-pxa/devices.c Unfortunately this file is built for other PXA variants which resulted in the following error: >> arm-linux-gnueabi-ld: arch/arm/mach-pxa/devices.o:(.data+0x167c): undefined reference to `gpio_set_wake' Fix this by using #ifdef around PXA25x and PXA27x GPIO controller device structures and associated data. Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202407112039.cyyIQ3Js-lkp@intel.com/ Fixes: 917195d6f829 ("ARM: pxa: consolidate GPIO chip platform data") Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> --- arch/arm/mach-pxa/devices.c | 2 ++ 1 file changed, 2 insertions(+)