From: Alexandru M Stan Date: Wed, 2 Sep 2015 23:27:59 +0000 (-0700) Subject: ARM: dts: rockchip: Remove specific cts pullup from veyron X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=035015b10e7545bb503413999070e99ccd32c1d2;p=linux-beck.git ARM: dts: rockchip: Remove specific cts pullup from veyron With the previous patch ("rk3288: pull up cts lines") this is redundant, I sent that patch for the same reason this existed here, so the lines don't wiggle randomly when disconnected. Signed-off-by: Alexandru M Stan Reviewed-by: Douglas Anderson Signed-off-by: Heiko Stuebner --- diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi index 2fa7a0dc83f7..2b5d2e2aa606 100644 --- a/arch/arm/boot/dts/rk3288-veyron.dtsi +++ b/arch/arm/boot/dts/rk3288-veyron.dtsi @@ -543,18 +543,6 @@ }; }; - /* - * On Marvell-based hardware this is a no-connect. Make sure we enable - * the pullup so that the line doesn't float. The pullup shouldn't - * hurt on Broadcom-based hardware since the other side is actively - * driving this signal. As proof: we've already got a pullup on RX. - */ - uart0 { - uart0_cts: uart0-cts { - rockchip,pins = <4 18 RK_FUNC_1 &pcfg_pull_up>; - }; - }; - write-protect { fw_wp_ap: fw-wp-ap { rockchip,pins = <7 6 RK_FUNC_GPIO &pcfg_pull_none>;