mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: linux-arm-kernel@lists.infradead.org
Cc: Chen-Yu Tsai <wens@csie.org>, Hans de Goede <hdegoede@redhat.com>,
	linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com,
	Maxime Ripard <maxime.ripard@free-electrons.com>
Subject: [PATCH v3 3/5] ARM: sun5i: dt: Move uart3 pinctrl node to common DTSI
Date: Fri,  9 Oct 2015 09:42:55 +0100	[thread overview]
Message-ID: <1444380177-15302-4-git-send-email-maxime.ripard@free-electrons.com> (raw)
In-Reply-To: <1444380177-15302-1-git-send-email-maxime.ripard@free-electrons.com>

The uart3 pins are shared between the A10s and A13, move the pinctrl node
to the common DTSI to avoid duplication.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
---
 arch/arm/boot/dts/sun5i-a10s.dtsi | 7 -------
 arch/arm/boot/dts/sun5i.dtsi      | 7 +++++++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index 0fdabe8eb9e8..2ebd32f5bc6e 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -204,13 +204,6 @@
 		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
 	};
 
-	uart3_pins_a: uart3@0 {
-		allwinner,pins = "PG9", "PG10";
-		allwinner,function = "uart3";
-		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
-	};
-
 	emac_pins_a: emac0@0 {
 		allwinner,pins = "PA0", "PA1", "PA2",
 				"PA3", "PA4", "PA5", "PA6",
diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi
index 78b993abbaa3..433c83a321ca 100644
--- a/arch/arm/boot/dts/sun5i.dtsi
+++ b/arch/arm/boot/dts/sun5i.dtsi
@@ -529,6 +529,13 @@
 				allwinner,drive = <SUN4I_PINCTRL_30_MA>;
 				allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
 			};
+
+			uart3_pins_a: uart3@0 {
+				allwinner,pins = "PG9", "PG10";
+				allwinner,function = "uart3";
+				allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+				allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+			};
 		};
 
 		timer@01c20c00 {
-- 
2.5.3


  parent reply	other threads:[~2015-10-09  8:44 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-09  8:42 [PATCH v3 0/5] ARM: sunxi: Introduce CHIP support Maxime Ripard
2015-10-09  8:42 ` [PATCH v3 1/5] ARM: sunxi: Add R8 support Maxime Ripard
2015-10-09 14:20   ` Chen-Yu Tsai
2015-10-11 17:08     ` Maxime Ripard
2015-10-09  8:42 ` [PATCH v3 2/5] ARM: sun5i: Add R8 DTSI Maxime Ripard
2015-10-09  8:42 ` Maxime Ripard [this message]
2015-10-09 14:22   ` [PATCH v3 3/5] ARM: sun5i: dt: Move uart3 pinctrl node to common DTSI Chen-Yu Tsai
2015-10-11 17:09     ` Maxime Ripard
2015-10-09  8:42 ` [PATCH v3 4/5] ARM: sun5i: dt: Add UART3 CTS and RTS pins Maxime Ripard
2015-10-09 14:24   ` Chen-Yu Tsai
2015-10-11 17:10     ` Maxime Ripard
2015-10-09  8:42 ` [PATCH v3 5/5] ARM: sun5i: Add C.H.I.P DTS Maxime Ripard
2015-10-09 15:22   ` Chen-Yu Tsai
2015-10-11 17:20     ` Maxime Ripard
2015-10-12  2:20       ` Chen-Yu Tsai
2015-10-12  9:32         ` Maxime Ripard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1444380177-15302-4-git-send-email-maxime.ripard@free-electrons.com \
    --to=maxime.ripard@free-electrons.com \
    --cc=hdegoede@redhat.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sunxi@googlegroups.com \
    --cc=wens@csie.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®