aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-rockchip/px30/px30.c
diff options
context:
space:
mode:
authorPaul Kocialkowski <paul.kocialkowski@bootlin.com>2019-11-28 15:27:51 +0100
committerKever Yang <kever.yang@rock-chips.com>2019-12-05 23:53:07 +0800
commitec4fafdf1ffac38785644d4100d12951a483faac (patch)
tree84798ec57a6b0e0887d67db664c741192daafd40 /arch/arm/mach-rockchip/px30/px30.c
parentb0c5e37d0e8aaaadec6298fc7932797b1eb38d9c (diff)
downloadu-boot-ec4fafdf1ffac38785644d4100d12951a483faac.zip
u-boot-ec4fafdf1ffac38785644d4100d12951a483faac.tar.gz
u-boot-ec4fafdf1ffac38785644d4100d12951a483faac.tar.bz2
rockchip: px30: Rename CONFIG_DEBUG_UART2_CHANNEL to CONFIG_DEBUG_UART_CHANNEL
UART3 also has two sets of pins that can be selected. Rename the config option to a common name, to allow it to be used for both UART2 and UART3. Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Diffstat (limited to 'arch/arm/mach-rockchip/px30/px30.c')
-rw-r--r--arch/arm/mach-rockchip/px30/px30.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-rockchip/px30/px30.c b/arch/arm/mach-rockchip/px30/px30.c
index bacdcc0..a2241cf 100644
--- a/arch/arm/mach-rockchip/px30/px30.c
+++ b/arch/arm/mach-rockchip/px30/px30.c
@@ -222,7 +222,7 @@ void board_debug_uart_init(void)
UART2_CLK_SEL_MASK,
UART2_CLK_SEL_UART2 << UART2_CLK_SEL_SHIFT);
-#if (CONFIG_DEBUG_UART2_CHANNEL == 1)
+#if (CONFIG_DEBUG_UART_CHANNEL == 1)
/* Enable early UART2 */
rk_clrsetreg(&grf->iofunc_con0,
CON_IOMUX_UART2SEL_MASK,
@@ -241,7 +241,7 @@ void board_debug_uart_init(void)
GPIO1D3_MASK | GPIO1D2_MASK,
GPIO1D3_UART2_RXM0 << GPIO1D3_SHIFT |
GPIO1D2_UART2_TXM0 << GPIO1D2_SHIFT);
-#endif /* CONFIG_DEBUG_UART2_CHANNEL == 1 */
+#endif /* CONFIG_DEBUG_UART_CHANNEL == 1 */
#endif /* CONFIG_DEBUG_UART_BASE && CONFIG_DEBUG_UART_BASE == ... */
}