Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1643185 > unrolled thread

[PATCH v2 2/3] arm: dts: rk322x: correct uart2 pinctrl and add another sets

Started byFrank Wang <frank.wang@rock-chips.com>
First post2017-05-17 12:00 +0200
Last post2017-05-17 20:30 +0200
Articles 2 — 2 participants

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.


Contents

  [PATCH v2 2/3] arm: dts: rk322x: correct uart2 pinctrl and add another sets Frank Wang <frank.wang@rock-chips.com> - 2017-05-17 12:00 +0200
    Re: [PATCH v2 2/3] arm: dts: rk322x: correct uart2 pinctrl and add another sets Heiko Stuebner <heiko@sntech.de> - 2017-05-17 20:30 +0200

#1643185 — [PATCH v2 2/3] arm: dts: rk322x: correct uart2 pinctrl and add another sets

FromFrank Wang <frank.wang@rock-chips.com>
Date2017-05-17 12:00 +0200
Subject[PATCH v2 2/3] arm: dts: rk322x: correct uart2 pinctrl and add another sets
Message-ID<tI3Ul-1pv-5@gated-at.bofh.it>
Correct UART2 PINCTRL flag and add another PINCTRL sets for UART2
in case of confict with SDMMC.

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
---
 arch/arm/boot/dts/rk322x.dtsi | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/rk322x.dtsi b/arch/arm/boot/dts/rk322x.dtsi
index cc6a27d..fe6530f 100644
--- a/arch/arm/boot/dts/rk322x.dtsi
+++ b/arch/arm/boot/dts/rk322x.dtsi
@@ -693,7 +693,7 @@
 
 		uart2 {
 			uart2_xfer: uart2-xfer {
-				rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_none>,
+				rockchip,pins = <1 18 RK_FUNC_2 &pcfg_pull_up>,
 						<1 19 RK_FUNC_2 &pcfg_pull_none>;
 			};
 
@@ -705,5 +705,12 @@
 				rockchip,pins = <0 24 RK_FUNC_1 &pcfg_pull_none>;
 			};
 		};
+
+		uart2-1 {
+			uart21_xfer: uart21-xfer {
+				rockchip,pins = <1 10 RK_FUNC_2 &pcfg_pull_up>,
+						<1 9 RK_FUNC_2 &pcfg_pull_none>;
+			};
+		};
 	};
 };
-- 
2.0.0

[toc] | [next] | [standalone]


#1643578

FromHeiko Stuebner <heiko@sntech.de>
Date2017-05-17 20:30 +0200
Message-ID<tIbRU-6Bk-19@gated-at.bofh.it>
In reply to#1643185
Am Mittwoch, 17. Mai 2017, 17:52:25 CEST schrieb Frank Wang:
> Correct UART2 PINCTRL flag and add another PINCTRL sets for UART2
> in case of confict with SDMMC.
> 
> Signed-off-by: Frank Wang <frank.wang@rock-chips.com>

I've split that into 2 patches:
- pull-up fix
- addition of alternative pinctrl
  (also moved the uart21-xfer into the uart2 group directly below the
   uart2-xfer pinctrl)

I've fixed up the subject in both (ARM: dts: rockchip:) and applied
everything for 4.13


Heiko

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web