diff options
author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2015-06-22 09:56:09 (GMT) |
---|---|---|
committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2015-10-11 17:09:08 (GMT) |
commit | 6ef8c8bf4c05028407ae75173f5790e5957640d2 (patch) | |
tree | a1c1366d77a460beb523853d8a15564480868ca2 /arch | |
parent | 49e4f3c3271e7eff2800596ba168c932d7d702b8 (diff) | |
download | linux-6ef8c8bf4c05028407ae75173f5790e5957640d2.tar.xz |
ARM: sun5i: dt: Move uart3 pinctrl node to common DTSI
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>
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/dts/sun5i-a10s.dtsi | 7 | ||||
-rw-r--r-- | 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 0fdabe8..2ebd32f 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 78b993a..433c83a 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 { |