From: Lubomir Rintel <lkundrak@v3.sk>
Date: Fri, 20 Mar 2020 17:40:59 +0000 (+0100)
Subject: ARM: dts: pxa*: Fix serial port names
X-Git-Tag: v5.7-rc1~149^2~12
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8524e2a939083b5e985d1cdd86e029c2b2e21faa;p=users%2Fjedix%2Flinux-maple.git

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 72f8cb60cb531..41dc79c9f6320 100644
--- 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 b3d6182d4de4a..209b1f0ea67b2 100644
--- 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>;