| Message ID | 1435611800-21833-1-git-send-email-merker@debian.org |
|---|---|
| State | Accepted |
| Delegated to: | Hans de Goede |
| Headers | show |
Hi Tom, On 29-06-15 23:03, Karsten Merker wrote: > 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 <merker@debian.org> 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
diff --git a/arch/arm/cpu/armv7/sunxi/board.c b/arch/arm/cpu/armv7/sunxi/board.c index 0344362..1c26865 100644 --- a/arch/arm/cpu/armv7/sunxi/board.c +++ b/arch/arm/cpu/armv7/sunxi/board.c @@ -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))
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 <merker@debian.org> --- arch/arm/cpu/armv7/sunxi/board.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)