summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2013-02-20 17:25:03 -0800
committerMaxime Ripard <maxime.ripard@free-electrons.com>2013-03-29 09:17:44 +0100
commit89b3c99fd9e7a95c8920f16092e639269fe48378 (patch)
tree205efb995f0b3984592a072a168a475a6784a640 /arch/arm
parentb00adbe07181a4ae265e8d757b3ad5e0a56e194c (diff)
downloadtalos-obmc-linux-89b3c99fd9e7a95c8920f16092e639269fe48378.tar.gz
talos-obmc-linux-89b3c99fd9e7a95c8920f16092e639269fe48378.zip
ARM: sunxi: dt: Move uart0 to sun4i-a10.dtsi
The UART0 is only available on the Allwinner A10 SoCs, and not on the A13, so move the uart0 node to sun4i-a10.dtsi. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Emilio López <emilio@elopez.com.ar> Tested-by: Emilio López <emilio@elopez.com.ar>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/sun4i-a10.dtsi10
-rw-r--r--arch/arm/boot/dts/sunxi.dtsi10
2 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index 03d2b532a077..b605672424ac 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -47,5 +47,15 @@
allwinner,pull = <0>;
};
};
+
+ uart0: serial@01c28000 {
+ compatible = "snps,dw-apb-uart";
+ reg = <0x01c28000 0x400>;
+ interrupts = <1>;
+ reg-shift = <2>;
+ reg-io-width = <4>;
+ clocks = <&osc>;
+ status = "disabled";
+ };
};
};
diff --git a/arch/arm/boot/dts/sunxi.dtsi b/arch/arm/boot/dts/sunxi.dtsi
index 5b1893fb7eb2..eb6f77025b73 100644
--- a/arch/arm/boot/dts/sunxi.dtsi
+++ b/arch/arm/boot/dts/sunxi.dtsi
@@ -136,16 +136,6 @@
#interrupt-cells = <1>;
};
- uart0: serial@01c28000 {
- compatible = "snps,dw-apb-uart";
- reg = <0x01c28000 0x400>;
- interrupts = <1>;
- reg-shift = <2>;
- reg-io-width = <4>;
- clocks = <&osc>;
- status = "disabled";
- };
-
uart1: serial@01c28400 {
compatible = "snps,dw-apb-uart";
reg = <0x01c28400 0x400>;
OpenPOWER on IntegriCloud