ARM: tegra: Fix unit_address_vs_reg DTC warnings for /memory

Add a generic /memory node in each Tegra DTSI (with empty reg property,
to be overidden by each DTS) and set proper unit address for /memory
nodes to fix the DTC warnings:

    arch/arm/boot/dts/tegra20-harmony.dtb: Warning (unit_address_vs_reg):
        /memory: node has a reg or ranges property, but no unit name

The DTB after the change is the same as before except adding
unit-address to /memory node.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts
index eafff16765b4ae6be20f0c77a1454c4d02c00f09..1788556b497790e5bee3fe7f643e43198f9ad1da 100644 (file)
--- a/arch/arm/boot/dts/tegra114-dalmore.dts
+++ b/arch/arm/boot/dts/tegra114-dalmore.dts
@@ -23,7 +23,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@80000000 {
                reg = <0x80000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/tegra114-roth.dts b/arch/arm/boot/dts/tegra114-roth.dts
index 7ed7370ee67a9e3b12d7e4134a9a05fbd0374863..3d3835591cd2ceee0d1d6ff55378d3394c6f0a77 100644 (file)
--- a/arch/arm/boot/dts/tegra114-roth.dts
+++ b/arch/arm/boot/dts/tegra114-roth.dts
@@ -28,7 +28,7 @@
                };
        };
 
-       memory {
+       memory@80000000 {
                /* memory >= 0x79600000 is reserved for firmware usage */
                reg = <0x80000000 0x79600000>;
        };

diff --git a/arch/arm/boot/dts/tegra114-tn7.dts b/arch/arm/boot/dts/tegra114-tn7.dts
index 7fc4a8b31e45c2a694dbd9b64a148a1668fd6313..bfdd1bf618161b403d9f75cbd5cea5ca927ce5af 100644 (file)
--- a/arch/arm/boot/dts/tegra114-tn7.dts
+++ b/arch/arm/boot/dts/tegra114-tn7.dts
@@ -28,7 +28,7 @@
                };
        };
 
-       memory {
+       memory@80000000 {
                /* memory >= 0x37e00000 is reserved for firmware usage */
                reg = <0x80000000 0x37e00000>;
        };

diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi
index d45337f61b9288b610ad90ca77db51085c9a3585..0d7a6327e404a6eca0353de81eb2acd18b5b0e2b 100644 (file)
--- a/arch/arm/boot/dts/tegra114.dtsi
+++ b/arch/arm/boot/dts/tegra114.dtsi
@@ -11,8 +11,9 @@
        #address-cells = <1>;
        #size-cells = <1>;
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
+               reg = <0x80000000 0x0>;
        };
 
        host1x@50000000 {

diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
index 3455822350c5984fb483d7e7f5d66708436af3e6..573aaa50fff1c47f0eae1492bc8ed575a3510f0f 100644 (file)
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
@@ -15,7 +15,7 @@
        compatible = "toradex,apalis-tk1-v1.2", "toradex,apalis-tk1",
                     "nvidia,tegra124";
 
-       memory {
+       memory@80000000 {
                reg = <0x0 0x80000000 0x0 0x80000000>;
        };
 

diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi
index 9f960c84ba10ce0c0b2e0ec5e37e067b5cc7ef20..0f0d4a4988b90fafb9f4ab39c1825b9b3a635055 100644 (file)
--- a/arch/arm/boot/dts/tegra124-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
@@ -50,7 +50,7 @@
        model = "Toradex Apalis TK1";
        compatible = "toradex,apalis-tk1", "nvidia,tegra124";
 
-       memory {
+       memory@80000000 {
                reg = <0x0 0x80000000 0x0 0x80000000>;
        };
 

diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
index 6dbcf84dafbc1cb6d845d7cb53adb288758abc2b..9151b3ebb839c9623445906d117936b20d744429 100644 (file)
--- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts
+++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
@@ -24,7 +24,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@80000000 {
                reg = <0x0 0x80000000 0x0 0x80000000>;
        };
 

diff --git a/arch/arm/boot/dts/tegra124-nyan.dtsi b/arch/arm/boot/dts/tegra124-nyan.dtsi
index 3609367037a6cbb3bcf4b924deb11dfd9c59ac13..d5f11d6d987ea52236b113b49e761b329c948e08 100644 (file)
--- a/arch/arm/boot/dts/tegra124-nyan.dtsi
+++ b/arch/arm/boot/dts/tegra124-nyan.dtsi
@@ -13,7 +13,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@80000000 {
                reg = <0x0 0x80000000 0x0 0x80000000>;
        };
 

diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts
index 89bcc178994df75967527eb40f75ccf81b7f3669..82d139648ef144f2c6c6fd6d996eacd83cb4785a 100644 (file)
--- a/arch/arm/boot/dts/tegra124-venice2.dts
+++ b/arch/arm/boot/dts/tegra124-venice2.dts
@@ -18,7 +18,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@80000000 {
                reg = <0x0 0x80000000 0x0 0x80000000>;
        };
 

diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
index 951feea784af385b4b44a9a49d7f805783c966b9..183c5acafb22b5a653d07f47d747c90bd7684c34 100644 (file)
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -13,8 +13,9 @@
        #address-cells = <2>;
        #size-cells = <2>;
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
+               reg = <0x0 0x80000000 0x0 0x0>;
        };
 
        pcie@1003000 {

diff --git a/arch/arm/boot/dts/tegra20-colibri-512.dtsi b/arch/arm/boot/dts/tegra20-colibri-512.dtsi
index 5c202b3e3bb1dc68d009c50d27ba2203d765656c..5623ff8d128c4c11275b0e5eec8bf3cc31107940 100644 (file)
--- a/arch/arm/boot/dts/tegra20-colibri-512.dtsi
+++ b/arch/arm/boot/dts/tegra20-colibri-512.dtsi
@@ -10,7 +10,7 @@
                rtc1 = "/rtc@7000e000";
        };
 
-       memory {
+       memory@0 {
                reg = <0x00000000 0x20000000>;
        };
 

diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts
index 628a55a9318befb6e098aaeb3e593185fb544dbc..1d96d92b72a7bf538a54f03a33f064914e418dc1 100644 (file)
--- a/arch/arm/boot/dts/tegra20-harmony.dts
+++ b/arch/arm/boot/dts/tegra20-harmony.dts
@@ -18,7 +18,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@0 {
                reg = <0x00000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts
index 30436969adc0e48761cefd136de13bc8e06b071d..ef245291924f076d73aec01d5ad0f68db0e92589 100644 (file)
--- a/arch/arm/boot/dts/tegra20-paz00.dts
+++ b/arch/arm/boot/dts/tegra20-paz00.dts
@@ -19,7 +19,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@0 {
                reg = <0x00000000 0x20000000>;
        };
 

diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts
index 284aae351ff234df64928b28d36a882a31bb2876..f91441683aada20c26dd649a72f52761131ee4c5 100644 (file)
--- a/arch/arm/boot/dts/tegra20-seaboard.dts
+++ b/arch/arm/boot/dts/tegra20-seaboard.dts
@@ -18,7 +18,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@0 {
                reg = <0x00000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/tegra20-tamonten.dtsi b/arch/arm/boot/dts/tegra20-tamonten.dtsi
index 872046d48709a3e5f8abb701432f1891c72ad85c..20137fc578b1b48a7d3c4cfa323f26dbeb322ac8 100644 (file)
--- a/arch/arm/boot/dts/tegra20-tamonten.dtsi
+++ b/arch/arm/boot/dts/tegra20-tamonten.dtsi
@@ -15,7 +15,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@0 {
                reg = <0x00000000 0x20000000>;
        };
 

diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts
index d55c6b240a30db3b5dc1c075f642b4deec6bbbf1..9eb26dc15f6b66092dee98f77bd68260933c9204 100644 (file)
--- a/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -18,7 +18,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@0 {
                reg = <0x00000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/tegra20-ventana.dts b/arch/arm/boot/dts/tegra20-ventana.dts
index ee3fbf941e79871190fbe26c4796b9c33afc7a7f..f44551e2d9d03ede72abe695b17605c703da647e 100644 (file)
--- a/arch/arm/boot/dts/tegra20-ventana.dts
+++ b/arch/arm/boot/dts/tegra20-ventana.dts
@@ -18,7 +18,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@0 {
                reg = <0x00000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index 20ea6b1bbe2f1648ee4efaa8336aab8a3f4e8649..86d8cd6f95481278cd6ba00a6f065ae23f12615a 100644 (file)
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -11,8 +11,9 @@
        #address-cells = <1>;
        #size-cells = <1>;
 
-       memory {
+       memory@0 {
                device_type = "memory";
+               reg = <0 0>;
        };
 
        iram@40000000 {

diff --git a/arch/arm/boot/dts/tegra30-apalis.dtsi b/arch/arm/boot/dts/tegra30-apalis.dtsi
index 01796dcc5fce10bff42fe00eb70215620aafde7e..349c04d18f63594e14e5e77cd50ffc077ff0f597 100644 (file)
--- a/arch/arm/boot/dts/tegra30-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra30-apalis.dtsi
@@ -10,8 +10,8 @@
        model = "Toradex Apalis T30";
        compatible = "toradex,apalis_t30", "nvidia,tegra30";
 
-       memory {
-               reg = <0 0>;
+       memory@80000000 {
+               reg = <0x80000000 0x40000000>;
        };
 
        pcie@3000 {

diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts
index ae52a5039506a2fd58be77cacef44fe97e2148bf..1434d50438f974cec64a1576d0e103a559fedaf8 100644 (file)
--- a/arch/arm/boot/dts/tegra30-beaver.dts
+++ b/arch/arm/boot/dts/tegra30-beaver.dts
@@ -17,7 +17,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@80000000 {
                reg = <0x80000000 0x7ff00000>;
        };
 

diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi
index 3b1db7b9ec502c444aedc438c89fda6777347ad6..fb9222b479d2d91e1bf0b700afdf78abd36c6879 100644 (file)
--- a/arch/arm/boot/dts/tegra30-cardhu.dtsi
+++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi
@@ -40,7 +40,7 @@
                stdout-path = "serial0:115200n8";
        };
 
-       memory {
+       memory@80000000 {
                reg = <0x80000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/tegra30-colibri.dtsi b/arch/arm/boot/dts/tegra30-colibri.dtsi
index c44d8c40c410b15d7f8c3654252e8bdd116f7f33..9bf3327665d37593510ad12c233cf3e5d2f3077c 100644 (file)
--- a/arch/arm/boot/dts/tegra30-colibri.dtsi
+++ b/arch/arm/boot/dts/tegra30-colibri.dtsi
@@ -10,7 +10,7 @@
        model = "Toradex Colibri T30";
        compatible = "toradex,colibri_t30", "nvidia,tegra30";
 
-       memory {
+       memory@80000000 {
                reg = <0x80000000 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi
index 0a3267aebbe3573efbba0543fd09b016826e14ce..a6781f6533105e7e27a7bb1e9da8f066cc1814a8 100644 (file)
--- a/arch/arm/boot/dts/tegra30.dtsi
+++ b/arch/arm/boot/dts/tegra30.dtsi
@@ -11,8 +11,9 @@
        #address-cells = <1>;
        #size-cells = <1>;
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
+               reg = <0x80000000 0x0>;
        };
 
        pcie@3000 {