sunxi: board: Fix UART PortF pinmux setup
Subsystems (3)
PATCH 1/1 sunxi: board: Fix UART PortF pinmux setup
When CONFIG_UART0_PORT_F is defined, we try to configure two PortF pins (usually used for the SD card) as UART0. Some SoCs use the mux value of 3 for this, while others use 4.
The combination of Kconfig symbols we currently use was not quite right:
we mis-configure the A31, A64, H6 and H616.
Going through the list in the pinctrl driver, there are only a few older SoCs that use a value of 4, so revert the #ifdef clause, and name those explicitly, instead of the other way around.
--- arch/arm/mach-sunxi/board.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
arch/arm/mach-sunxi/board.c +7 -6
@@ -87,15 +87,16 @@ static int gpio_init(void)sunxi_gpio_set_cfgpin (SUNXI_GPB (22 ),SUNXI_GPIO_INPUT );sunxi_gpio_set_cfgpin (SUNXI_GPB (23 ),SUNXI_GPIO_INPUT );#endif -#if (defined(CONFIG_MACH_SUN8I ) && !defined(CONFIG_MACH_SUN8I_R40 )) || \ - defined(CONFIG_MACH_SUNIV ) -sunxi_gpio_set_cfgpin (SUNXI_GPF (2 ),SUN8I_GPF_UART0 ); -sunxi_gpio_set_cfgpin (SUNXI_GPF (4 ),SUN8I_GPF_UART0 ); -#else +#if defined(CONFIG_MACH_SUN4I ) || defined(CONFIG_MACH_SUN5I ) || \ + defined(CONFIG_MACH_SUN7I ) || defined(CONFIG_MACH_SUN8I_R40 ) || \ + defined(CONFIG_MACH_SUN9I )sunxi_gpio_set_cfgpin (SUNXI_GPF (2 ),SUNXI_GPF_UART0 );sunxi_gpio_set_cfgpin (SUNXI_GPF (4 ),SUNXI_GPF_UART0 ); +#else +sunxi_gpio_set_cfgpin (SUNXI_GPF (2 ),SUN8I_GPF_UART0 ); +sunxi_gpio_set_cfgpin (SUNXI_GPF (4 ),SUN8I_GPF_UART0 );#endif -sunxi_gpio_set_pull (SUNXI_GPF (4 ),1 ); +sunxi_gpio_set_pull (SUNXI_GPF (4 ),SUNXI_GPIO_PULL_UP );#elif CONFIG_CONS_INDEX == 1 && defined(CONFIG_MACH_SUNIV)sunxi_gpio_set_cfgpin (SUNXI_GPE (0 ),SUNIV_GPE_UART0 );sunxi_gpio_set_cfgpin (SUNXI_GPE (1 ),SUNIV_GPE_UART0 );
Signature · 1 line
2.35.3
Quoted 4 lines · Andre Przywara
When
CONFIG_UART0_PORT_Fis defined, we try to configure two PortF pins (usually used for the SD card) as UART0. Some SoCs use the mux value of 3 for this, while others use 4.
Quoted 8 lines
The combination of
Kconfigsymbols we currently use was not quite right:
we mis-configure the A31, A64, H6 and H616.Going through the list in the pinctrl driver, there are only a few older SoCs that use a value of 4, so revert the #ifdef clause, and name those explicitly, instead of the other way around.
Signed-off-by Andre Przywara <[email protected]>
Andre Przywara
AppliedQuoted 4 lines · On Fri, 6 May 2022 01:37:03 +0100 Andre Przywara <[email protected]>…
When
CONFIG_UART0_PORT_Fis defined, we try to configure two PortF pins (usually used for the SD card) as UART0. Some SoCs use the mux value of 3 for this, while others use 4.
Quoted 8 lines
The combination of
Kconfigsymbols we currently use was not quite right:
we mis-configure the A31, A64, H6 and H616.Going through the list in the pinctrl driver, there are only a few older SoCs that use a value of 4, so revert the #ifdef clause, and name those explicitly, instead of the other way around.
Signed-off-by Andre Przywara <[email protected]>
Applied to sunxi/master.
Thanks,
Andre
Quoted 31 lines
--- arch/arm/mach-sunxi/board.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)arch/arm/mach-sunxi/board.c +7
-6@@ -87,15 +87,16 @@ static int gpio_init(void)sunxi_gpio_set_cfgpin (SUNXI_GPB (22 ),SUNXI_GPIO_INPUT );sunxi_gpio_set_cfgpin (SUNXI_GPB (23 ),SUNXI_GPIO_INPUT );#endif -#if (defined(CONFIG_MACH_SUN8I ) && !defined(CONFIG_MACH_SUN8I_R40 )) || \ - defined(CONFIG_MACH_SUNIV ) -sunxi_gpio_set_cfgpin (SUNXI_GPF (2 ),SUN8I_GPF_UART0 ); -sunxi_gpio_set_cfgpin (SUNXI_GPF (4 ),SUN8I_GPF_UART0 ); -#else +#if defined(CONFIG_MACH_SUN4I ) || defined(CONFIG_MACH_SUN5I ) || \ + defined(CONFIG_MACH_SUN7I ) || defined(CONFIG_MACH_SUN8I_R40 ) || \ + defined(CONFIG_MACH_SUN9I )sunxi_gpio_set_cfgpin (SUNXI_GPF (2 ),SUNXI_GPF_UART0 );sunxi_gpio_set_cfgpin (SUNXI_GPF (4 ),SUNXI_GPF_UART0 ); +#else +sunxi_gpio_set_cfgpin (SUNXI_GPF (2 ),SUN8I_GPF_UART0 ); +sunxi_gpio_set_cfgpin (SUNXI_GPF (4 ),SUN8I_GPF_UART0 );#endif -sunxi_gpio_set_pull (SUNXI_GPF (4 ),1 ); +sunxi_gpio_set_pull (SUNXI_GPF (4 ),SUNXI_GPIO_PULL_UP );#elif CONFIG_CONS_INDEX == 1 && defined(CONFIG_MACH_SUNIV)sunxi_gpio_set_cfgpin (SUNXI_GPE (0 ),SUNIV_GPE_UART0 );sunxi_gpio_set_cfgpin (SUNXI_GPE (1 ),SUNIV_GPE_UART0 );