From 99f754dcaa2d8df70556c1c4166142447fa587fa Mon Sep 17 00:00:00 2001 From: Steven Liu Date: Tue, 15 Nov 2022 20:13:40 +0800 Subject: [PATCH] Revert "ARM: dts: rockchip: Fix UART pull-ups on rk3036" This reverts commit eb04688f6fd61747a9ad7d31fc3ab44ff71c553f. Signed-off-by: Steven Liu Change-Id: Ifbc43c2b6ba476fcc3c50c71b21b05aee4dd91c4 --- arch/arm/boot/dts/rk3036.dtsi | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi index 351e4b1631a7..9ac64dd5f11d 100644 --- a/arch/arm/boot/dts/rk3036.dtsi +++ b/arch/arm/boot/dts/rk3036.dtsi @@ -746,10 +746,6 @@ bias-pull-pin-default; }; - pcfg_pull_up: pcfg-pull-up { - bias-pull-up; - }; - pcfg_pull_none: pcfg-pull-none { bias-disable; }; @@ -910,8 +906,8 @@ uart0 { uart0_xfer: uart0-xfer { - rockchip,pins = <0 RK_PC0 1 &pcfg_pull_up>, - <0 RK_PC1 1 &pcfg_pull_up>; + rockchip,pins = <0 RK_PC0 1 &pcfg_pull_default>, + <0 RK_PC1 1 &pcfg_pull_default>; }; uart0_cts: uart0-cts { @@ -925,16 +921,16 @@ uart1 { uart1_xfer: uart1-xfer { - rockchip,pins = <2 RK_PC6 1 &pcfg_pull_up>, - <2 RK_PC7 1 &pcfg_pull_up>; + rockchip,pins = <2 RK_PC6 1 &pcfg_pull_default>, + <2 RK_PC7 1 &pcfg_pull_default>; }; /* no rts / cts for uart1 */ }; uart2 { uart2_xfer: uart2-xfer { - rockchip,pins = <1 RK_PC2 2 &pcfg_pull_up>, - <1 RK_PC3 2 &pcfg_pull_up>; + rockchip,pins = <1 RK_PC2 2 &pcfg_pull_default>, + <1 RK_PC3 2 &pcfg_pull_default>; }; /* no rts / cts for uart2 */ };