Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1239602
| From | Maxime Ripard <maxime.ripard@free-electrons.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v2 3/5] ARM: sun5i: dt: Move uart3 pinctrl node to common DTSI |
| Date | 2015-10-05 16:30 +0200 |
| Message-ID | <qgeW6-1th-29@gated-at.bofh.it> (permalink) |
| References | <qgeW5-1th-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v2 0/5] ARM: sunxi: Introduce CHIP support Maxime Ripard <maxime.ripard@free-electrons.com> - 2015-10-05 16:30 +0200
[PATCH v2 3/5] ARM: sun5i: dt: Move uart3 pinctrl node to common DTSI Maxime Ripard <maxime.ripard@free-electrons.com> - 2015-10-05 16:30 +0200
[PATCH v2 1/5] ARM: sunxi: Add R8 support Maxime Ripard <maxime.ripard@free-electrons.com> - 2015-10-05 16:30 +0200
[PATCH v2 4/5] ARM: sun5i: dt: Add UART3 CTS and RTS pins Maxime Ripard <maxime.ripard@free-electrons.com> - 2015-10-05 16:30 +0200
[PATCH v2 5/5] ARM: sun5i: Add C.H.I.P DTS Maxime Ripard <maxime.ripard@free-electrons.com> - 2015-10-05 16:30 +0200
Re: [linux-sunxi] [PATCH v2 5/5] ARM: sun5i: Add C.H.I.P DTS Julian Calaby <julian.calaby@gmail.com> - 2015-10-06 03:20 +0200
Re: [linux-sunxi] [PATCH v2 5/5] ARM: sun5i: Add C.H.I.P DTS Maxime Ripard <maxime.ripard@free-electrons.com> - 2015-10-06 18:20 +0200
Re: [linux-sunxi] [PATCH v2 5/5] ARM: sun5i: Add C.H.I.P DTS Julian Calaby <julian.calaby@gmail.com> - 2015-10-07 00:40 +0200
Re: [linux-sunxi] [PATCH v2 5/5] ARM: sun5i: Add C.H.I.P DTS Maxime Ripard <maxime.ripard@free-electrons.com> - 2015-10-07 11:30 +0200
csiph-web