Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit dead06c

Browse files
dtorarndb
authored andcommitted
ARM: pxa: fix build breakage on PXA3xx
Commit 917195d ("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: 917195d ("ARM: pxa: consolidate GPIO chip platform data") Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1 parent ed75ace commit dead06c

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

arch/arm/mach-pxa/devices.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,7 @@ struct platform_device pxa27x_device_pwm1 = {
633633
};
634634
#endif /* CONFIG_PXA27x || CONFIG_PXA3xx */
635635

636+
#if defined(CONFIG_PXA25x) || defined(CONFIG_PXA27x)
636637
const struct software_node pxa2xx_gpiochip_node = {
637638
.name = "gpio-pxa",
638639
};
@@ -684,6 +685,7 @@ struct platform_device pxa27x_device_gpio = {
684685
.platform_data = &pxa2xx_gpio_info,
685686
},
686687
};
688+
#endif /* CONFIG_PXA25x || CONFIG_PXA27x */
687689

688690
static struct resource pxa_dma_resource[] = {
689691
[0] = {

0 commit comments

Comments
 (0)