arm64: dts: fvp/juno: Fix node address fields

[ Upstream commit bb5cce12ac717c7462217cd493ed701d12d6dbce ]

The Arm Ltd. boards were using an outdated address convention in the DT
node names, by separating the high from the low 32-bits of an address by
a comma.

Remove the comma from the node name suffix to be DT spec compliant.

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

diff --git a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
index dfae90adbb7caa393c0dc9f319c0c09ce6cf40e3..ce64bfb22f22abda268cb573c1e28ef155668d61 100644 (file)
--- a/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
+++ b/arch/arm/boot/dts/vexpress-v2m-rs1.dtsi
@@ -31,7 +31,7 @@
                        #interrupt-cells = <1>;
                        ranges;
 
-                       nor_flash: flash@0,00000000 {
+                       nor_flash: flash@0 {
                                compatible = "arm,vexpress-flash", "cfi-flash";
                                reg = <0 0x00000000 0x04000000>,
                                      <4 0x00000000 0x04000000>;
@@ -41,13 +41,13 @@
                                };
                        };
 
-                       psram@1,00000000 {
+                       psram@100000000 {
                                compatible = "arm,vexpress-psram", "mtd-ram";
                                reg = <1 0x00000000 0x02000000>;
                                bank-width = <4>;
                        };
 
-                       ethernet@2,02000000 {
+                       ethernet@202000000 {
                                compatible = "smsc,lan9118", "smsc,lan9115";
                                reg = <2 0x02000000 0x10000>;
                                interrupts = <15>;
@@ -59,14 +59,14 @@
                                vddvario-supply = <&v2m_fixed_3v3>;
                        };
 
-                       usb@2,03000000 {
+                       usb@203000000 {
                                compatible = "nxp,usb-isp1761";
                                reg = <2 0x03000000 0x20000>;
                                interrupts = <16>;
                                port1-otg;
                        };
 
-                       iofpga@3,00000000 {
+                       iofpga@300000000 {
                                compatible = "simple-bus";
                                #address-cells = <1>;
                                #size-cells = <1>;

diff --git a/arch/arm64/boot/dts/arm/foundation-v8.dtsi b/arch/arm64/boot/dts/arm/foundation-v8.dtsi
index 2a6aa43241b3b2ad812e3b5dcbcee50ae67e3a31..05d1657170b4958462886515c529e06dd031afbe 100644 (file)
--- a/arch/arm64/boot/dts/arm/foundation-v8.dtsi
+++ b/arch/arm64/boot/dts/arm/foundation-v8.dtsi
@@ -151,7 +151,7 @@
                                <0 0 41 &gic 0 GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>,
                                <0 0 42 &gic 0 GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
 
-               ethernet@2,02000000 {
+               ethernet@202000000 {
                        compatible = "smsc,lan91c111";
                        reg = <2 0x02000000 0x10000>;
                        interrupts = <15>;
@@ -178,7 +178,7 @@
                        clock-output-names = "v2m:refclk32khz";
                };
 
-               iofpga@3,00000000 {
+               iofpga@300000000 {
                        compatible = "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;

diff --git a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
index 9f60dacb4f80fbe193185abb76d70f05a4106eef..1234a8cfc0a9221be9252965f44af9693e99c402 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
@@ -103,7 +103,7 @@
                                };
                        };
 
-                       flash@0,00000000 {
+                       flash@0 {
                                /* 2 * 32MiB NOR Flash memory mounted on CS0 */
                                compatible = "arm,vexpress-flash", "cfi-flash";
                                reg = <0 0x00000000 0x04000000>;
@@ -120,7 +120,7 @@
                                };
                        };
 
-                       ethernet@2,00000000 {
+                       ethernet@200000000 {
                                compatible = "smsc,lan9118", "smsc,lan9115";
                                reg = <2 0x00000000 0x10000>;
                                interrupts = <3>;
@@ -133,7 +133,7 @@
                                vddvario-supply = <&mb_fixed_3v3>;
                        };
 
-                       iofpga@3,00000000 {
+                       iofpga@300000000 {
                                compatible = "simple-bus";
                                #address-cells = <1>;
                                #size-cells = <1>;

diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi
index 57b0b9d7f3fae49993d01f824be95d85cfc9d207..29e6962c70bd979676186141727f4a3a571482c2 100644 (file)
--- a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi
+++ b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard-rs2.dtsi
@@ -9,7 +9,7 @@
                motherboard {
                        arm,v2m-memory-map = "rs2";
 
-                       iofpga@3,00000000 {
+                       iofpga@300000000 {
                                virtio-p9@140000 {
                                        compatible = "virtio,mmio";
                                        reg = <0x140000 0x200>;

diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
index 03a7bf079c8ffd26f3d4c225b82d585ee55a8353..ad20076357f5005736ab3efc664446efda62d38c 100644 (file)
--- a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
+++ b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
@@ -17,14 +17,14 @@
                        #interrupt-cells = <1>;
                        ranges;
 
-                       flash@0,00000000 {
+                       flash@0 {
                                compatible = "arm,vexpress-flash", "cfi-flash";
                                reg = <0 0x00000000 0x04000000>,
                                      <4 0x00000000 0x04000000>;
                                bank-width = <4>;
                        };
 
-                       ethernet@2,02000000 {
+                       ethernet@202000000 {
                                compatible = "smsc,lan91c111";
                                reg = <2 0x02000000 0x10000>;
                                interrupts = <15>;
@@ -51,7 +51,7 @@
                                clock-output-names = "v2m:refclk32khz";
                        };
 
-                       iofpga@3,00000000 {
+                       iofpga@300000000 {
                                compatible = "simple-bus";
                                #address-cells = <1>;
                                #size-cells = <1>;