ARM: dts: pxa*: Fix serial port names

There's a preferred node name for serial ports, and it's not "uart":

  pxa910-dkb.dt.yaml: uart@d4017000: $nodename:0: 'uart@d4017000'
      does not match '^serial(@[0-9a-f,]+)*$'
  ...

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Reviewed-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20200320174107.29406-3-lkundrak@v3.sk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/arm/boot/dts/pxa168.dtsi b/arch/arm/boot/dts/pxa168.dtsi
index 72f8cb60cb5311ebcd342131e6bdf2bbb5dd44e6..41dc79c9f632000a364146e5c4e4b2ff0b5ba7e7 100644 (file)
--- a/arch/arm/boot/dts/pxa168.dtsi
+++ b/arch/arm/boot/dts/pxa168.dtsi
@@ -55,7 +55,7 @@
                                interrupts = <13>;
                        };
 
-                       uart1: uart@d4017000 {
+                       uart1: serial@d4017000 {
                                compatible = "mrvl,mmp-uart";
                                reg = <0xd4017000 0x1000>;
                                interrupts = <27>;
@@ -64,7 +64,7 @@
                                status = "disabled";
                        };
 
-                       uart2: uart@d4018000 {
+                       uart2: serial@d4018000 {
                                compatible = "mrvl,mmp-uart";
                                reg = <0xd4018000 0x1000>;
                                interrupts = <28>;
@@ -73,7 +73,7 @@
                                status = "disabled";
                        };
 
-                       uart3: uart@d4026000 {
+                       uart3: serial@d4026000 {
                                compatible = "mrvl,mmp-uart";
                                reg = <0xd4026000 0x1000>;
                                interrupts = <29>;

diff --git a/arch/arm/boot/dts/pxa910.dtsi b/arch/arm/boot/dts/pxa910.dtsi
index b3d6182d4de4a895b1825ee2fe8e693a6f17136b..209b1f0ea67b2580681e1f9f1edf59bee4059eff 100644 (file)
--- a/arch/arm/boot/dts/pxa910.dtsi
+++ b/arch/arm/boot/dts/pxa910.dtsi
@@ -67,7 +67,7 @@
                                status = "disabled";
                        };
 
-                       uart1: uart@d4017000 {
+                       uart1: serial@d4017000 {
                                compatible = "mrvl,mmp-uart";
                                reg = <0xd4017000 0x1000>;
                                interrupts = <27>;
@@ -76,7 +76,7 @@
                                status = "disabled";
                        };
 
-                       uart2: uart@d4018000 {
+                       uart2: serial@d4018000 {
                                compatible = "mrvl,mmp-uart";
                                reg = <0xd4018000 0x1000>;
                                interrupts = <28>;
@@ -85,7 +85,7 @@
                                status = "disabled";
                        };
 
-                       uart3: uart@d4036000 {
+                       uart3: serial@d4036000 {
                                compatible = "mrvl,mmp-uart";
                                reg = <0xd4036000 0x1000>;
                                interrupts = <59>;