From 7a35e84b14fa75ace4d55602fa50f99bb97d0e93 Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Tue, 15 Nov 2022 20:10:57 +0800 Subject: [PATCH] Revert "ARM: dts: rockchip: Fix UART pull-ups on rk3066a" This reverts commit dd2f0befb2b01fceb16f015c93d0276faa5d0c3b. Signed-off-by: Steven Liu Change-Id: I6efc99eea9740888fa0b7b311435c394381c7d9f --- arch/arm/boot/dts/rk3066a.dtsi | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi index 71e2495d78b2..3993abc9468f 100644 --- a/arch/arm/boot/dts/rk3066a.dtsi +++ b/arch/arm/boot/dts/rk3066a.dtsi @@ -503,10 +503,6 @@ bias-pull-pin-default; }; - pcfg_pull_up: pcfg-pull-up { - bias-pull-up; - }; - pcfg_pull_none: pcfg_pull_none { bias-disable; }; @@ -658,8 +654,8 @@ uart0 { uart0_xfer: uart0-xfer { - rockchip,pins = <1 RK_PA0 1 &pcfg_pull_up>, - <1 RK_PA1 1 &pcfg_pull_up>; + rockchip,pins = <1 RK_PA0 1 &pcfg_pull_default>, + <1 RK_PA1 1 &pcfg_pull_default>; }; uart0_cts: uart0-cts { @@ -673,8 +669,8 @@ uart1 { uart1_xfer: uart1-xfer { - rockchip,pins = <1 RK_PA4 1 &pcfg_pull_up>, - <1 RK_PA5 1 &pcfg_pull_up>; + rockchip,pins = <1 RK_PA4 1 &pcfg_pull_default>, + <1 RK_PA5 1 &pcfg_pull_default>; }; uart1_cts: uart1-cts { @@ -688,16 +684,16 @@ uart2 { uart2_xfer: uart2-xfer { - rockchip,pins = <1 RK_PB0 1 &pcfg_pull_up>, - <1 RK_PB1 1 &pcfg_pull_up>; + rockchip,pins = <1 RK_PB0 1 &pcfg_pull_default>, + <1 RK_PB1 1 &pcfg_pull_default>; }; /* no rts / cts for uart2 */ }; uart3 { uart3_xfer: uart3-xfer { - rockchip,pins = <3 RK_PD3 1 &pcfg_pull_up>, - <3 RK_PD4 1 &pcfg_pull_up>; + rockchip,pins = <3 RK_PD3 1 &pcfg_pull_default>, + <3 RK_PD4 1 &pcfg_pull_default>; }; uart3_cts: uart3-cts {