diff options
author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2013-02-20 20:25:03 -0500 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2013-03-29 04:17:44 -0400 |
commit | 89b3c99fd9e7a95c8920f16092e639269fe48378 (patch) | |
tree | 205efb995f0b3984592a072a168a475a6784a640 | |
parent | b00adbe07181a4ae265e8d757b3ad5e0a56e194c (diff) |
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>
-rw-r--r-- | arch/arm/boot/dts/sun4i-a10.dtsi | 10 | ||||
-rw-r--r-- | arch/arm/boot/dts/sunxi.dtsi | 10 |
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 @@ | |||
47 | allwinner,pull = <0>; | 47 | allwinner,pull = <0>; |
48 | }; | 48 | }; |
49 | }; | 49 | }; |
50 | |||
51 | uart0: serial@01c28000 { | ||
52 | compatible = "snps,dw-apb-uart"; | ||
53 | reg = <0x01c28000 0x400>; | ||
54 | interrupts = <1>; | ||
55 | reg-shift = <2>; | ||
56 | reg-io-width = <4>; | ||
57 | clocks = <&osc>; | ||
58 | status = "disabled"; | ||
59 | }; | ||
50 | }; | 60 | }; |
51 | }; | 61 | }; |
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 @@ | |||
136 | #interrupt-cells = <1>; | 136 | #interrupt-cells = <1>; |
137 | }; | 137 | }; |
138 | 138 | ||
139 | uart0: serial@01c28000 { | ||
140 | compatible = "snps,dw-apb-uart"; | ||
141 | reg = <0x01c28000 0x400>; | ||
142 | interrupts = <1>; | ||
143 | reg-shift = <2>; | ||
144 | reg-io-width = <4>; | ||
145 | clocks = <&osc>; | ||
146 | status = "disabled"; | ||
147 | }; | ||
148 | |||
149 | uart1: serial@01c28400 { | 139 | uart1: serial@01c28400 { |
150 | compatible = "snps,dw-apb-uart"; | 140 | compatible = "snps,dw-apb-uart"; |
151 | reg = <0x01c28400 0x400>; | 141 | reg = <0x01c28400 0x400>; |