ARM: dts: bcm283x: Fix DTC warning for memory node

Compiling the bcm283x DTS with W=1 leads to the following warning:

Warning (unit_address_vs_reg): /memory: node has a reg or ranges property,
but no unit name

Fix this by adding the unit address.

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Tested-by: Peter Robinson <pbrobinson@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
index 29f970f864dc1d42a7fb9204cae7e649c1c68560..a8b175a9e229e4f46e531c4856a7f2609eb1c8f6 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
@@ -1,7 +1,7 @@
 #include <dt-bindings/power/raspberrypi-power.h>
 
 / {
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0 0x10000000>;
        };

diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
index ac4408b34b58ef0e7c7be3063fb6dc87c150b5cd..871fc4a558cf9b480e598e1a4af1d489d2d30bd8 100644 (file)
--- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
+++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
@@ -9,7 +9,7 @@
        compatible = "raspberrypi,2-model-b", "brcm,bcm2836";
        model = "Raspberry Pi 2 Model B";
 
-       memory {
+       memory@0 {
                reg = <0 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
index e9fadd3382271c41ecd782b52f91364bfa8bce73..7f4437a8eedbe338e00332a3e7e82e1587aad874 100644 (file)
--- a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
@@ -13,7 +13,7 @@
                stdout-path = "serial1:115200n8";
        };
 
-       memory {
+       memory@0 {
                reg = <0 0x20000000>;
        };
 

diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
index 42bb09044cc799baa227ef2050153656212c30a1..7d65013f5a4b6284777de6877d84404e41eff976 100644 (file)
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
@@ -14,7 +14,7 @@
                stdout-path = "serial1:115200n8";
        };
 
-       memory {
+       memory@0 {
                reg = <0 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
index 0c155dd4f396fe8bf0e2f34f7ee75f2ce8c4ed5d..9abb9c55e6e461d13ec0ba700d62cf030aa7c186 100644 (file)
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
@@ -14,7 +14,7 @@
                stdout-path = "serial1:115200n8";
        };
 
-       memory {
+       memory@0 {
                reg = <0 0x40000000>;
        };
 

diff --git a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
index 4a89a1885a3dc2f0796f323f366c15a55b9b64b6..81399b2c5af9e1f46e4d7e61fb2567bb84146aab 100644 (file)
--- a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
+++ b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
@@ -4,7 +4,7 @@
 #include "bcm2836-rpi.dtsi"
 
 / {
-       memory {
+       memory@0 {
                reg = <0 0x40000000>;
        };