diff options
| author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2013-03-18 05:54:49 -0400 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2013-03-29 04:17:38 -0400 |
| commit | b00adbe07181a4ae265e8d757b3ad5e0a56e194c (patch) | |
| tree | 3975d93d2081719142c97b67a1ee974f83769e6c | |
| parent | 4498578623148a27bb9683359fcd09746e109dfa (diff) | |
ARM: sunxi: Rename uart nodes to serial
The other architecture use serial@address for their uart nodes, so
rename our uart dt nodes to be consistent
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
| -rw-r--r-- | arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/sun4i-a10-hackberry.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/sunxi.dtsi | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts index 88e2dc13fd4d..cd06a3ca2196 100644 --- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts +++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts | |||
| @@ -36,11 +36,11 @@ | |||
| 36 | }; | 36 | }; |
| 37 | }; | 37 | }; |
| 38 | 38 | ||
| 39 | uart0: uart@01c28000 { | 39 | uart0: serial@01c28000 { |
| 40 | status = "okay"; | 40 | status = "okay"; |
| 41 | }; | 41 | }; |
| 42 | 42 | ||
| 43 | uart1: uart@01c28400 { | 43 | uart1: serial@01c28400 { |
| 44 | status = "okay"; | 44 | status = "okay"; |
| 45 | }; | 45 | }; |
| 46 | }; | 46 | }; |
diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts index f84549ad791e..9ab6875600bd 100644 --- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts +++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | }; | 23 | }; |
| 24 | 24 | ||
| 25 | soc { | 25 | soc { |
| 26 | uart0: uart@01c28000 { | 26 | uart0: serial@01c28000 { |
| 27 | status = "okay"; | 27 | status = "okay"; |
| 28 | }; | 28 | }; |
| 29 | }; | 29 | }; |
diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts index 33d1c7e71f25..f1579a831f90 100644 --- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts +++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | }; | 32 | }; |
| 33 | }; | 33 | }; |
| 34 | 34 | ||
| 35 | uart1: uart@01c28400 { | 35 | uart1: serial@01c28400 { |
| 36 | pinctrl-names = "default"; | 36 | pinctrl-names = "default"; |
| 37 | pinctrl-0 = <&uart1_pins_b>; | 37 | pinctrl-0 = <&uart1_pins_b>; |
| 38 | status = "okay"; | 38 | status = "okay"; |
diff --git a/arch/arm/boot/dts/sunxi.dtsi b/arch/arm/boot/dts/sunxi.dtsi index 287deb79e515..5b1893fb7eb2 100644 --- a/arch/arm/boot/dts/sunxi.dtsi +++ b/arch/arm/boot/dts/sunxi.dtsi | |||
| @@ -136,7 +136,7 @@ | |||
| 136 | #interrupt-cells = <1>; | 136 | #interrupt-cells = <1>; |
| 137 | }; | 137 | }; |
| 138 | 138 | ||
| 139 | uart0: uart@01c28000 { | 139 | uart0: serial@01c28000 { |
| 140 | compatible = "snps,dw-apb-uart"; | 140 | compatible = "snps,dw-apb-uart"; |
| 141 | reg = <0x01c28000 0x400>; | 141 | reg = <0x01c28000 0x400>; |
| 142 | interrupts = <1>; | 142 | interrupts = <1>; |
| @@ -146,7 +146,7 @@ | |||
| 146 | status = "disabled"; | 146 | status = "disabled"; |
| 147 | }; | 147 | }; |
| 148 | 148 | ||
| 149 | uart1: uart@01c28400 { | 149 | uart1: serial@01c28400 { |
| 150 | compatible = "snps,dw-apb-uart"; | 150 | compatible = "snps,dw-apb-uart"; |
| 151 | reg = <0x01c28400 0x400>; | 151 | reg = <0x01c28400 0x400>; |
| 152 | interrupts = <2>; | 152 | interrupts = <2>; |