Skip to contentSkip to conversation

sunxi: Fix wrong pinmux names in arch/arm/cpu/armv7/sunxi/board.c

PATCH New Karsten Merker 2 participants 2 messages Jun 29, 2015 – Jul 5, 2015

Subsystems (2)
Arm (32-bit) Arm/Allwinner sunXi SoC support
lore
Share & tools
lore

Karsten Merker

author
#0 lore raw

PATCH 1/1 sunxi: Fix wrong pinmux names in arch/arm/cpu/armv7/sunxi/board.c

Commit 487b3277d4f70bcb2e4a1930beb6438565f25910
(sunxi: GPIO pin mux hardware-feature-specific function index defines) has removed and/or changed the names of various pinmux definitions, but has missed two instances in arch/arm/cpu/armv7/sunxi/board.c that still refer to the old-style names, which can now no longer be resolved. Use the new-style pinmux names instead.

Signed-off-by Karsten Merker <[email protected]>
---
 arch/arm/cpu/armv7/sunxi/board.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/cpu/armv7/sunxi/board.c +4 -4
index 0344362..1c26865 100644
@@ -45,11 +45,11 @@ static int gpio_init(void)
 	sunxi_gpio_set_cfgpin(SUNXI_GPB(23), SUNXI_GPIO_INPUT);
 #endif
 #if defined(CONFIG_MACH_SUN8I)
-	sunxi_gpio_set_cfgpin(SUNXI_GPF(2), SUN8I_GPF_UART0_TX);
-	sunxi_gpio_set_cfgpin(SUNXI_GPF(4), SUN8I_GPF_UART0_RX);
+	sunxi_gpio_set_cfgpin(SUNXI_GPF(2), SUN8I_GPF_UART0);
+	sunxi_gpio_set_cfgpin(SUNXI_GPF(4), SUN8I_GPF_UART0);
 #else
-	sunxi_gpio_set_cfgpin(SUNXI_GPF(2), SUNXI_GPF_UART0_TX);
-	sunxi_gpio_set_cfgpin(SUNXI_GPF(4), SUNXI_GPF_UART0_RX);
+	sunxi_gpio_set_cfgpin(SUNXI_GPF(2), SUNXI_GPF_UART0);
+	sunxi_gpio_set_cfgpin(SUNXI_GPF(4), SUNXI_GPF_UART0);
 #endif
 	sunxi_gpio_set_pull(SUNXI_GPF(4), 1);
 #elif CONFIG_CONS_INDEX == 1 && (defined(CONFIG_MACH_SUN4I) || defined(CONFIG_MACH_SUN7I))
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 sunxi: Fix wrong pinmux names in arch/arm/cpu/armv7/sunxi/board.c

Hi Tom,

Quoted 8 lines · Karsten Merker

Commit 487b3277d4f70bcb2e4a1930beb6438565f25910
(sunxi: GPIO pin mux hardware-feature-specific function index defines) has removed and/or changed the names of various pinmux definitions, but has missed two instances in arch/arm/cpu/armv7/sunxi/board.c that still refer to the old-style names, which can now no longer be resolved. Use the new-style pinmux names instead.

Signed-off-by Karsten Merker <[email protected]>

Thanks for the patch, I already had the exact same patch from ChenYu queued up, and even send a pull-req for it, but that bounced due to conflicts. I've just send a new pull-req for v2015.07 with ChenYu's fix in there, so this should be fixed for the next rc.

Regards,

Hans