[PATCH v2 1/2] ARM: dts: sun7i: Add uart4_pins_b definition

[PATCH v2 1/2] ARM: dts: sun7i: Add uart4_pins_b definition

[Hans de Goede]

From: Michael Ring <mail@michael-ring.org>

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

Signed-off-by: Michael Ring <mail@michael-ring.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 arch/arm/boot/dts/sun7i-a20.dtsi | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index e04cdf9..99d48b4 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -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

[PATCH v2 2/2] ARM: dts: sun7i: Add uart4 support for BananaPro, disable uart2

[Hans de Goede]

From: Michael Ring <mail@michael-ring.org>

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

Remove the uart2 node, people who want to use uart2 can do so with a
devicetree-overlay.

Signed-off-by: Michael Ring <mail@michael-ring.org>
[hdegoede at redhat.com: Remove uart2 node]
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
Changes in v2:
-Remove uart2 node instead of disabling it
---
 arch/arm/boot/dts/sun7i-a20-bananapro.dts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
index 45e2a02..18fcc87 100644
--- a/arch/arm/boot/dts/sun7i-a20-bananapro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapro.dts
@@ -52,7 +52,7 @@
 
 	aliases {
 		serial0 = &uart0;
-		serial1 = &uart2;
+		serial1 = &uart4;
 		serial2 = &uart7;
 	};
 
@@ -250,9 +250,9 @@
 	status = "okay";
 };
 
-&uart2 {
+&uart4 {
 	pinctrl-names = "default";
-	pinctrl-0 = <&uart2_pins_a>;
+	pinctrl-0 = <&uart4_pins_b>;
 	status = "okay";
 };
 
-- 
2.4.1

[PATCH v2 2/2] ARM: dts: sun7i: Add uart4 support for BananaPro, disable uart2

[Maxime Ripard]

On Fri, May 22, 2015 at 04:33:04PM +0200, Hans de Goede wrote:
> From: Michael Ring <mail@michael-ring.org>
> 
> 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
> 
> Remove the uart2 node, people who want to use uart2 can do so with a
> devicetree-overlay.
> 
> Signed-off-by: Michael Ring <mail@michael-ring.org>
> [hdegoede at redhat.com: Remove uart2 node]
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Applied both, 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/20150522/93eda0c6/attachment.sig>