summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2013-03-18 13:54:49 +0400
committerMaxime Ripard <maxime.ripard@free-electrons.com>2013-03-29 12:17:38 +0400
commitb00adbe07181a4ae265e8d757b3ad5e0a56e194c (patch)
tree3975d93d2081719142c97b67a1ee974f83769e6c /arch
parent4498578623148a27bb9683359fcd09746e109dfa (diff)
downloadlinux-b00adbe07181a4ae265e8d757b3ad5e0a56e194c.tar.xz
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/sun4i-a10-cubieboard.dts4
-rw-r--r--arch/arm/boot/dts/sun4i-a10-hackberry.dts2
-rw-r--r--arch/arm/boot/dts/sun5i-a13-olinuxino.dts2
-rw-r--r--arch/arm/boot/dts/sunxi.dtsi4
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 @@
};
};
- uart0: uart@01c28000 {
+ uart0: serial@01c28000 {
status = "okay";
};
- uart1: uart@01c28400 {
+ uart1: serial@01c28400 {
status = "okay";
};
};
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 @@
};
soc {
- uart0: uart@01c28000 {
+ uart0: serial@01c28000 {
status = "okay";
};
};
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 @@
};
};
- uart1: uart@01c28400 {
+ uart1: serial@01c28400 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins_b>;
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 @@
#interrupt-cells = <1>;
};
- uart0: uart@01c28000 {
+ uart0: serial@01c28000 {
compatible = "snps,dw-apb-uart";
reg = <0x01c28000 0x400>;
interrupts = <1>;
@@ -146,7 +146,7 @@
status = "disabled";
};
- uart1: uart@01c28400 {
+ uart1: serial@01c28400 {
compatible = "snps,dw-apb-uart";
reg = <0x01c28400 0x400>;
interrupts = <2>;