Skip to contentSkip to conversation

ARM: pxa: fix build breakage on PXA3xx

PATCH Applied Dmitry Torokhov 2 participants 2 messages Jul 13, 2024 – Jul 15, 2024

Subsystems (3)
Arm (32-bit) Arm sub-architectures PXA2xx/PXA3xx support
lore
Share & tools
lore

Dmitry Torokhov

author
#0 lore raw

PATCH 1/1 ARM: pxa: fix build breakage on PXA3xx

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:

Quoted 1 line
Quoted 1 line

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 <[email protected]>
Closes https://lore.kernel.org/oe-kbuild-all/[email protected]/ open here
Fixes 917195d6f829 ("ARM: pxa: consolidate GPIO chip platform data")
Signed-off-by Dmitry Torokhov <[email protected]>
---
 arch/arm/mach-pxa/devices.c | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/mach-pxa/devices.c +2 -0
index d050a4c78f97..7695cfce01a1 100644
@@ -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] = {
Signature · 5 lines
2.45.2.993.g49e7a77208-goog


-- 
Dmitry
CI Applied
#1 lore raw
This patch was applied to soc/soc.git (for-next) by Arnd Bergmann <[email protected]>:

Hello:

This patch was applied to soc/soc.git (for-next)
by Arnd Bergmann <[email protected]>:

Quoted 9 lines · 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:

Quoted 1 line
Quoted 1 line

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!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html