From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: Mike Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@codeaurora.org>,
linux-arm-kernel@lists.infradead.org
Cc: Chen-Yu Tsai <wens@csie.org>, Hans de Goede <hdegoede@redhat.com>,
linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-sunxi@googlegroups.com,
Maxime Ripard <maxime.ripard@free-electrons.com>
Subject: [PATCH 3/5] ARM: sun5i: dt: Move uart3 pinctrl node to common DTSI
Date: Fri, 18 Sep 2015 10:48:48 +0200 [thread overview]
Message-ID: <1442566130-3497-4-git-send-email-maxime.ripard@free-electrons.com> (raw)
In-Reply-To: <1442566130-3497-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>
---
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.1
next prev parent reply other threads:[~2015-09-18 8:49 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-18 8:48 [PATCH 0/5] ARM: sunxi: Introduce CHIP support Maxime Ripard
2015-09-18 8:48 ` [PATCH 1/5] ARM: sunxi: Add R8 support Maxime Ripard
2015-09-18 9:47 ` Chen-Yu Tsai
2015-09-18 12:20 ` Maxime Ripard
2015-09-30 22:38 ` Stephen Boyd
2015-10-01 6:58 ` Maxime Ripard
2015-09-18 8:48 ` [PATCH 2/5] ARM: sun5i: Add R8 DTSI Maxime Ripard
2015-09-18 9:41 ` Chen-Yu Tsai
2015-09-18 12:19 ` Maxime Ripard
2015-09-18 8:48 ` Maxime Ripard [this message]
2015-09-18 8:48 ` [PATCH 4/5] ARM: sun5i: dt: Add UART3 CTS and RTS pins Maxime Ripard
2015-09-18 8:48 ` [PATCH 5/5] ARM: sun5i: Add C.H.I.P DTS Maxime Ripard
2015-09-18 16:41 ` Chen-Yu Tsai
2015-09-22 12:47 ` Maxime Ripard
2015-09-22 12:57 ` [linux-sunxi] " Chen-Yu Tsai
2015-09-22 13:01 ` Hans de Goede
2015-09-22 13:34 ` Hans de Goede
2015-09-22 14:04 ` Maxime Ripard
2015-09-22 14:30 ` Hans de Goede
2015-09-29 19:36 ` Maxime Ripard
2015-09-18 9:02 ` [PATCH 0/5] ARM: sunxi: Introduce CHIP support Arnd Bergmann
2015-09-18 12:19 ` Maxime Ripard
2015-09-18 13:18 ` Arnd Bergmann
2015-09-18 13:55 ` Maxime Ripard
2015-09-18 13:58 ` Arnd Bergmann
2015-09-18 15:36 ` [linux-sunxi] " Hans de Goede
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=1442566130-3497-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-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=mturquette@baylibre.com \
--cc=sboyd@codeaurora.org \
--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®