ARM: dts: sun7i: Add uart4_pins_b definition

From: Michael Ring <[email protected]>

Some boards (e.g. the BananaPro) use alternative pins for uart4, add a pinmux entry for these.

---
 arch/arm/boot/dts/sun7i-a20.dtsi | 7 +++++++
 1 file changed, 7 insertions(+)

index e04cdf9..99d48b4 100644
@@ -844,6 +844,13 @@
 				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 			};
 
+			uart4_pins_b: uart4 at 1 {
+				allwinner,pins = "PH4", "PH5";
+				allwinner,function = "uart4";
+				allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+			};
+
 			uart5_pins_a: uart5 at 0 {
 				allwinner,pins = "PI10", "PI11";
 				allwinner,function = "uart5";

2.4.1

From: Michael Ring <[email protected]>

Uart2 is available at the bananapi io-pins, add a dts node for this (so that people can easily enable it) but leave it disabled as the pins are primarily intended for gpio as documented here:
http://wiki.lemaker.org/Pin_definition

---
 arch/arm/boot/dts/sun7i-a20-bananapi.dts | 7 +++++++
 1 file changed, 7 insertions(+)

index 9f7b472..3e357ef 100644
@@ -58,6 +58,7 @@
 		serial0 = &uart0;
 		serial1 = &uart3;
 		serial2 = &uart7;
+		serial3 = &uart2;
 	};
 
 	chosen {

@@ -204,6 +205,12 @@
 	status = "okay";
 };
 
+&uart2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart2_pins_a>;
+	status = "disabled";
+};
+
 &uart3 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart3_pins_b>;

2.4.1

So far the policy we had on this is only to add to the DT the primary purpose of these pins.

Even though that might seem arbitrary, it's the only way to prevent anyone adding their own configuration for those pins, which would be a mess to maintain and use. It's even more true since that sort of thing is exactly where the overlays shine.

So, I'm ok with adding the uart4, but the uart2 should go.

Maxime

Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150521/9e4a888d/attachment.sig>

From: Michael Ring <[email protected]>

The BananaPro uses uart4 for the default rx/tx pins on the 40 pins connector, so enable uart4.

Uart2 is also available at the bananapro io-pins, but like on the bananapi the primary function of the pins is to act as gpios, see:
http://forum.lemaker.org/forum.php?mod=viewthread&tid=10852

Disable the uart2 node by default, but leave it in place so that people can easily enable it.

---
 arch/arm/boot/dts/sun7i-a20-bananapro.dts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

index 45e2a02..4edb8a4 100644
@@ -52,8 +52,9 @@
 
 	aliases {
 		serial0 = &uart0;
-		serial1 = &uart2;
+		serial1 = &uart4;
 		serial2 = &uart7;
+		serial3 = &uart2;
 	};
 
 	chosen {

@@ -253,6 +254,12 @@
 &uart2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart2_pins_a>;
+	status = "disabled";
+};
+
+&uart4 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart4_pins_b>;
 	status = "okay";
 };
 

2.4.1

Applied, thanks!

Maxime

Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150521/1305244a/attachment.sig>