ARM: zynq: Remove DTC 1.4.2 warnings

DTC 1.4.2 reports these warnings:
Warning (unit_address_vs_reg): Node /memory has a reg or ranges
property, but no unit name
Warning (unit_address_vs_reg): Node /pmu has a reg or ranges property,
but no unit name
Warning (unit_address_vs_reg): Node /fixedregulator@0 has a unit name,
but no reg property

This patch is fixing them.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/dts/zynq-7000.dtsi b/arch/arm/dts/zynq-7000.dtsi
index c80c50d2b8ac2e4c813e3ca260e7cf5adcf3ade2..87f0e3e97c9218c274fbf7efe8f9f55a401a2ccf 100644 (file)
--- a/arch/arm/dts/zynq-7000.dtsi
+++ b/arch/arm/dts/zynq-7000.dtsi
@@ -6,9 +6,10 @@
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
-/include/ "skeleton.dtsi"
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        compatible = "xlnx,zynq-7000";
 
        cpus {
@@ -37,14 +38,14 @@
                };
        };
 
-       pmu {
+       pmu@f8891000 {
                compatible = "arm,cortex-a9-pmu";
                interrupts = <0 5 4>, <0 6 4>;
                interrupt-parent = <&intc>;
                reg = < 0xf8891000 0x1000 0xf8893000 0x1000 >;
        };
 
-       regulator_vccpint: fixedregulator@0 {
+       regulator_vccpint: fixedregulator {
                compatible = "regulator-fixed";
                regulator-name = "VCCPINT";
                regulator-min-microvolt = <1000000>;

diff --git a/arch/arm/dts/zynq-afx-nand.dts b/arch/arm/dts/zynq-afx-nand.dts
index 4604fa5df4e0990438f5b061a8a7cb7cc01524c3..ce22eacdb7f9f453eb7f98b8bdd6142a7e056dc3 100644 (file)
--- a/arch/arm/dts/zynq-afx-nand.dts
+++ b/arch/arm/dts/zynq-afx-nand.dts
@@ -25,7 +25,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x0 0x8000000>;
        };

diff --git a/arch/arm/dts/zynq-afx-nor.dts b/arch/arm/dts/zynq-afx-nor.dts
index 99d0f9d83dda27f93000efa35056fc25c3a2a779..eac205f05643d851e4a75fd6c9821adaeb8df139 100644 (file)
--- a/arch/arm/dts/zynq-afx-nor.dts
+++ b/arch/arm/dts/zynq-afx-nor.dts
@@ -25,7 +25,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x0 0x8000000>;
        };

diff --git a/arch/arm/dts/zynq-afx-qspi.dts b/arch/arm/dts/zynq-afx-qspi.dts
index 4a11d8881b8af83d69c63ed74cbfb3e5d10358e5..51036cf5e8b133c15b7f1036d1018d5ff4a83be0 100644 (file)
--- a/arch/arm/dts/zynq-afx-qspi.dts
+++ b/arch/arm/dts/zynq-afx-qspi.dts
@@ -28,7 +28,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x0 0x8000000>;
        };

diff --git a/arch/arm/dts/zynq-cc108.dts b/arch/arm/dts/zynq-cc108.dts
index 2467c19e1c158cb0abb3f797d1bc8744e52f3ca5..aabe58e7e110032e4dd660076c74cf34693aaaaa 100644 (file)
--- a/arch/arm/dts/zynq-cc108.dts
+++ b/arch/arm/dts/zynq-cc108.dts
@@ -27,7 +27,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x0 0x20000000>;
        };

diff --git a/arch/arm/dts/zynq-cse-qspi.dts b/arch/arm/dts/zynq-cse-qspi.dts
index 076ac417581ee9ae4e725cb8f4681f348474d6cb..00ecc6105284a7b129193d3427d95d13a7ba70d2 100644 (file)
--- a/arch/arm/dts/zynq-cse-qspi.dts
+++ b/arch/arm/dts/zynq-cse-qspi.dts
@@ -6,9 +6,10 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 /dts-v1/;
-/include/ "skeleton.dtsi"
 
 / {
+       #address-cells = <1>;
+       #size-cells = <1>;
        model = "Zynq CSE QSPI Board";
        compatible = "xlnx,zynq-cse-qspi", "xlnx,zynq-7000";
 
@@ -17,7 +18,7 @@
                serial0 = &uart1;
        };
 
-       memory {
+       memory@fffc0000 {
                device_type = "memory";
                reg = <0xFFFC0000 0x40000>;
        };

diff --git a/arch/arm/dts/zynq-microzed.dts b/arch/arm/dts/zynq-microzed.dts
index cb238cd5e7bbb68f59784143de40445d66492bc8..2d07b92e9cff99723365e1a0a1df1c780bc87a3e 100644 (file)
--- a/arch/arm/dts/zynq-microzed.dts
+++ b/arch/arm/dts/zynq-microzed.dts
@@ -18,7 +18,7 @@
                mmc0 = &sdhci0;
        };
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0 0x40000000>;
        };

diff --git a/arch/arm/dts/zynq-picozed.dts b/arch/arm/dts/zynq-picozed.dts
index 3408df8b8b3d5c6e3538a00b3a1a174ca5d295e1..fea04ab45a72834884f0eb852f005ad3db96cc1d 100644 (file)
--- a/arch/arm/dts/zynq-picozed.dts
+++ b/arch/arm/dts/zynq-picozed.dts
@@ -16,7 +16,7 @@
                serial0 = &uart1;
        };
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0 0x40000000>;
        };

diff --git a/arch/arm/dts/zynq-zc702.dts b/arch/arm/dts/zynq-zc702.dts
index ed98628d072d81963ebf3d35918388ccdb5d8549..2f44c396b7d44c0109eee23a56054f2967657725 100644 (file)
--- a/arch/arm/dts/zynq-zc702.dts
+++ b/arch/arm/dts/zynq-zc702.dts
@@ -21,7 +21,7 @@
                mmc0 = &sdhci0;
        };
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x0 0x40000000>;
        };

diff --git a/arch/arm/dts/zynq-zc706.dts b/arch/arm/dts/zynq-zc706.dts
index 883f5aa38467b809903a05fc48726808f94539c5..6ee052e5af49bffa6a841e49dc2a8c041c63b674 100644 (file)
--- a/arch/arm/dts/zynq-zc706.dts
+++ b/arch/arm/dts/zynq-zc706.dts
@@ -21,7 +21,7 @@
                mmc0 = &sdhci0;
        };
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x0 0x40000000>;
        };

diff --git a/arch/arm/dts/zynq-zc770-xm010.dts b/arch/arm/dts/zynq-zc770-xm010.dts
index 7c1bb696eb35df3eb00c86d9f30f256342d5e601..7d69fd01ba56ff6deeb5f6c21cc796cb32e30f4b 100644 (file)
--- a/arch/arm/dts/zynq-zc770-xm010.dts
+++ b/arch/arm/dts/zynq-zc770-xm010.dts
@@ -25,7 +25,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x0 0x40000000>;
        };

diff --git a/arch/arm/dts/zynq-zc770-xm011.dts b/arch/arm/dts/zynq-zc770-xm011.dts
index c051afbf3427698fac8e59f53d77f25ca1ef4d8c..28d72bbefe80d407dd38e8c8faadf2b3511f0a08 100644 (file)
--- a/arch/arm/dts/zynq-zc770-xm011.dts
+++ b/arch/arm/dts/zynq-zc770-xm011.dts
@@ -23,7 +23,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x0 0x40000000>;
        };

diff --git a/arch/arm/dts/zynq-zc770-xm012.dts b/arch/arm/dts/zynq-zc770-xm012.dts
index e7fd4ddc9da928aa7ffba348aef36315b04d8699..39db5ebdd043897ac41f3ccd385cba30c089a25f 100644 (file)
--- a/arch/arm/dts/zynq-zc770-xm012.dts
+++ b/arch/arm/dts/zynq-zc770-xm012.dts
@@ -24,7 +24,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x0 0x40000000>;
        };

diff --git a/arch/arm/dts/zynq-zc770-xm013.dts b/arch/arm/dts/zynq-zc770-xm013.dts
index a34bcdace85d80072236de60e3a692f178550efa..5d7f6b3c6fddbaf3251032c853e03cdd673aa07a 100644 (file)
--- a/arch/arm/dts/zynq-zc770-xm013.dts
+++ b/arch/arm/dts/zynq-zc770-xm013.dts
@@ -25,7 +25,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x0 0x40000000>;
        };

diff --git a/arch/arm/dts/zynq-zed.dts b/arch/arm/dts/zynq-zed.dts
index b17fb905a1b73b72ce315faf51867d85345b2e44..93a08d366251bbd16f2268f7417e4fb247191905 100644 (file)
--- a/arch/arm/dts/zynq-zed.dts
+++ b/arch/arm/dts/zynq-zed.dts
@@ -20,7 +20,7 @@
                mmc0 = &sdhci0;
        };
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x0 0x20000000>;
        };

diff --git a/arch/arm/dts/zynq-zybo.dts b/arch/arm/dts/zynq-zybo.dts
index f8dcf1d6995c4b98bf90092fa2d5342724a668e5..d59a3831352db66f137505bf4a0ce35b371a9f29 100644 (file)
--- a/arch/arm/dts/zynq-zybo.dts
+++ b/arch/arm/dts/zynq-zybo.dts
@@ -20,7 +20,7 @@
                mmc0 = &sdhci0;
        };
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x0 0x20000000>;
        };