From c8506fefff08a4e85306b0917a25ca64fdeb436d Mon Sep 17 00:00:00 2001 From: Yu Tu Date: Mon, 15 May 2023 17:23:31 +0800 Subject: [PATCH] uart: bringup c1 uart [1/1] PD#SWPL-121178 Problem: need bringup c1 uart Solution: add c1 uart config Verify: c1_ae400 Change-Id: I73594f0ab58491ea447b77dc39e03497681c7af7 Signed-off-by: Yu Tu --- .../dts/amlogic/meson-c1-c308x-ae400-nand.dts | 2 +- .../boot/dts/amlogic/meson-c1-c308x-ae400.dts | 2 +- .../boot/dts/amlogic/meson-c1-c308x-ae401.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-c1.dtsi | 21 ++++++++++++------- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-c1-c308x-ae400-nand.dts b/arch/arm64/boot/dts/amlogic/meson-c1-c308x-ae400-nand.dts index f352355e4..f04ec9495 100644 --- a/arch/arm64/boot/dts/amlogic/meson-c1-c308x-ae400-nand.dts +++ b/arch/arm64/boot/dts/amlogic/meson-c1-c308x-ae400-nand.dts @@ -1292,7 +1292,7 @@ }; &uart_C { - status = "okay"; + status = "disabled"; }; &i2c3 { diff --git a/arch/arm64/boot/dts/amlogic/meson-c1-c308x-ae400.dts b/arch/arm64/boot/dts/amlogic/meson-c1-c308x-ae400.dts index c5a9962de..9c37e1d9e 100644 --- a/arch/arm64/boot/dts/amlogic/meson-c1-c308x-ae400.dts +++ b/arch/arm64/boot/dts/amlogic/meson-c1-c308x-ae400.dts @@ -1237,7 +1237,7 @@ }; &uart_C { - status = "okay"; + status = "disabled"; rs485 = <0>; rts-gpio = <&gpio GPIOA_0 GPIO_ACTIVE_HIGH>; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-c1-c308x-ae401.dts b/arch/arm64/boot/dts/amlogic/meson-c1-c308x-ae401.dts index f29b25c9b..e4d0de6aa 100644 --- a/arch/arm64/boot/dts/amlogic/meson-c1-c308x-ae401.dts +++ b/arch/arm64/boot/dts/amlogic/meson-c1-c308x-ae401.dts @@ -1317,7 +1317,7 @@ }; &uart_C { - status = "okay"; + status = "disabled"; rs485 = <1>; rts-gpio = <&gpio GPIOA_0 GPIO_ACTIVE_HIGH>; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-c1.dtsi b/arch/arm64/boot/dts/amlogic/meson-c1.dtsi index 3b69399fe..524ce50f0 100644 --- a/arch/arm64/boot/dts/amlogic/meson-c1.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-c1.dtsi @@ -397,8 +397,8 @@ reg = <0x0 0x1c00 0x0 0x18>; interrupts = ; status = "disabled"; - //clocks = <&xtal - // &clkc CLKID_UART_A>; + clocks = <&xtal + &clkc CLKID_SYS_UART_A>; clock-names = "clk_uart", "clk_gate"; xtal_tick_en = <1>; @@ -417,8 +417,7 @@ clock-names = "clk_uart", "clk_gate"; fifosize = < 64 >; - //pinctrl-names = "default"; - //pinctrl-0 = <&b_uart_enable_pins1>; + xtal_tick_en = <1>; }; uart_C: serial@7000 { @@ -440,8 +439,8 @@ reg = < 0x0 0x9c00 0x0 0x18>; interrupts = ; status = "disabled"; - //clocks = <&xtal - // &clkc CLKID_SYS_UART_D>; + clocks = <&xtal + &clkc CLKID_SYS_UART_D>; clock-names = "clk_uart", "clk_gate"; fifosize = < 64 >; @@ -454,8 +453,8 @@ reg = < 0x0 0xa000 0x0 0x18>; interrupts = ; status = "disabled"; - //clocks = <&xtal - // &clkc CLKID_SYS_UART_E>; + clocks = <&xtal + &clkc CLKID_SYS_UART_E>; clock-names = "clk_uart", "clk_gate"; fifosize = < 64 >; @@ -1823,6 +1822,8 @@ "uart_a_cts", "uart_a_rts"; function = "uart_a"; + bias-pull-up; + drive-strength = <3>; }; }; @@ -1831,6 +1832,8 @@ groups = "uart_a_tx_x14", "uart_a_rx_x15"; function = "uart_a"; + bias-pull-up; + drive-strength = <3>; }; }; @@ -1867,6 +1870,8 @@ "uart_c_cts", "uart_c_rts"; function = "uart_c"; + bias-pull-up; + drive-strength = <3>; }; };