arm64: dts: fvp/juno: Fix serial node names

The UARTs for all Arm Ltd. boards were using "uart" as their node name
stub.

Replace that with the required "serial" string, to comply with the PL011
DT binding.

Link: https://lore.kernel.org/r/20200513103016.130417-14-andre.przywara@arm.com
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

diff --git a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
index d4d88ce996a5800860ae1c02761cbbe25d93d137..f4a65d693f157656fdcb94061bac6c56ebe38617 100644 (file)
--- a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
+++ b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
@@ -316,7 +316,7 @@
                                        clock-names = "KMIREFCLK", "apb_pclk";
                                };
 
-                               v2m_serial0: uart@90000 {
+                               v2m_serial0: serial@90000 {
                                        compatible = "arm,pl011", "arm,primecell";
                                        reg = <0x090000 0x1000>;
                                        interrupts = <5>;
@@ -324,7 +324,7 @@
                                        clock-names = "uartclk", "apb_pclk";
                                };
 
-                               v2m_serial1: uart@a0000 {
+                               v2m_serial1: serial@a0000 {
                                        compatible = "arm,pl011", "arm,primecell";
                                        reg = <0x0a0000 0x1000>;
                                        interrupts = <6>;
@@ -332,7 +332,7 @@
                                        clock-names = "uartclk", "apb_pclk";
                                };
 
-                               v2m_serial2: uart@b0000 {
+                               v2m_serial2: serial@b0000 {
                                        compatible = "arm,pl011", "arm,primecell";
                                        reg = <0x0b0000 0x1000>;
                                        interrupts = <7>;
@@ -340,7 +340,7 @@
                                        clock-names = "uartclk", "apb_pclk";
                                };
 
-                               v2m_serial3: uart@c0000 {
+                               v2m_serial3: serial@c0000 {
                                        compatible = "arm,pl011", "arm,primecell";
                                        reg = <0x0c0000 0x1000>;
                                        interrupts = <8>;

diff --git a/arch/arm64/boot/dts/arm/foundation-v8.dtsi b/arch/arm64/boot/dts/arm/foundation-v8.dtsi
index 63efb88595d4149c1082ce94740a341d03978fb8..e226c5e080c298983ddf7db6f166c8f6c85dbccc 100644 (file)
--- a/arch/arm64/boot/dts/arm/foundation-v8.dtsi
+++ b/arch/arm64/boot/dts/arm/foundation-v8.dtsi
@@ -189,7 +189,7 @@
                                reg = <0x010000 0x1000>;
                        };
 
-                       v2m_serial0: uart@90000 {
+                       v2m_serial0: serial@90000 {
                                compatible = "arm,pl011", "arm,primecell";
                                reg = <0x090000 0x1000>;
                                interrupts = <5>;
@@ -197,7 +197,7 @@
                                clock-names = "uartclk", "apb_pclk";
                        };
 
-                       v2m_serial1: uart@a0000 {
+                       v2m_serial1: serial@a0000 {
                                compatible = "arm,pl011", "arm,primecell";
                                reg = <0x0a0000 0x1000>;
                                interrupts = <6>;
@@ -205,7 +205,7 @@
                                clock-names = "uartclk", "apb_pclk";
                        };
 
-                       v2m_serial2: uart@b0000 {
+                       v2m_serial2: serial@b0000 {
                                compatible = "arm,pl011", "arm,primecell";
                                reg = <0x0b0000 0x1000>;
                                interrupts = <7>;
@@ -213,7 +213,7 @@
                                clock-names = "uartclk", "apb_pclk";
                        };
 
-                       v2m_serial3: uart@c0000 {
+                       v2m_serial3: serial@c0000 {
                                compatible = "arm,pl011", "arm,primecell";
                                reg = <0x0c0000 0x1000>;
                                interrupts = <8>;

diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
index 2b34661d426c6b00d1ca77cd35e121e0ea2a9cf2..ee860d53939537b12bda671c23eb31adbb89e0ab 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno-base.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
@@ -729,7 +729,7 @@
                };
        };
 
-       soc_uart0: uart@7ff80000 {
+       soc_uart0: serial@7ff80000 {
                compatible = "arm,pl011", "arm,primecell";
                reg = <0x0 0x7ff80000 0x0 0x1000>;
                interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
index f61e313ab1a4c31f0c7ab44771720b6448e65b9e..b81651b1890a523a2d1b5ede26a290bf7b0c8212 100644 (file)
--- a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
@@ -158,7 +158,7 @@
                                        clock-names = "KMIREFCLK", "apb_pclk";
                                };
 
-                               v2m_serial0: uart@90000 {
+                               v2m_serial0: serial@90000 {
                                        compatible = "arm,pl011", "arm,primecell";
                                        reg = <0x090000 0x1000>;
                                        interrupts = <5>;
@@ -166,7 +166,7 @@
                                        clock-names = "uartclk", "apb_pclk";
                                };
 
-                               v2m_serial1: uart@a0000 {
+                               v2m_serial1: serial@a0000 {
                                        compatible = "arm,pl011", "arm,primecell";
                                        reg = <0x0a0000 0x1000>;
                                        interrupts = <6>;
@@ -174,7 +174,7 @@
                                        clock-names = "uartclk", "apb_pclk";
                                };
 
-                               v2m_serial2: uart@b0000 {
+                               v2m_serial2: serial@b0000 {
                                        compatible = "arm,pl011", "arm,primecell";
                                        reg = <0x0b0000 0x1000>;
                                        interrupts = <7>;
@@ -182,7 +182,7 @@
                                        clock-names = "uartclk", "apb_pclk";
                                };
 
-                               v2m_serial3: uart@c0000 {
+                               v2m_serial3: serial@c0000 {
                                        compatible = "arm,pl011", "arm,primecell";
                                        reg = <0x0c0000 0x1000>;
                                        interrupts = <8>;