ARM: dts: bcm283x: Define memory at board level

Now with the varity of several RPi boards, the memory should be defined
at board level. This step gives us the chance to fix the memory size
of the RPi 1 B+, Zero (incl. W) and Compute Module 1.

Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Acked-by: Eric Anholt <eric@anholt.net>

diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
index cb3f08da5a4abd557c49a5a5f11f8c29ba81ac4f..5b42e9a61c14e085cc9ed77d2bbb5f44d2135fbb 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
@@ -8,6 +8,11 @@
        compatible = "raspberrypi,model-a-plus", "brcm,bcm2835";
        model = "Raspberry Pi Model A+";
 
+       memory@0 {
+               device_type = "memory";
+               reg = <0 0x10000000>;
+       };
+
        leds {
                act {
                        gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts
index 2d167d9e0bb4036cd0c674c6d78c6a455726bc57..b71621487c1623f1b366169ae4f9c9fe87530892 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-a.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts
@@ -8,6 +8,11 @@
        compatible = "raspberrypi,model-a", "brcm,bcm2835";
        model = "Raspberry Pi Model A";
 
+       memory@0 {
+               device_type = "memory";
+               reg = <0 0x10000000>;
+       };
+
        leds {
                act {
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
index 83a3a60e976e3b44c5f617e4237e3d8ad52f4f3f..3318082d351334d3f143456b7c45bbc73e31ec09 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
@@ -9,6 +9,11 @@
        compatible = "raspberrypi,model-b-plus", "brcm,bcm2835";
        model = "Raspberry Pi Model B+";
 
+       memory@0 {
+               device_type = "memory";
+               reg = <0 0x20000000>;
+       };
+
        leds {
                act {
                        gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
index b6b4feabb5b9bc9ad068c31ff519cc21d7db391e..97d7eb5e0e93077e4468d526af2bc66059b44141 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
@@ -9,6 +9,11 @@
        compatible = "raspberrypi,model-b-rev2", "brcm,bcm2835";
        model = "Raspberry Pi Model B rev2";
 
+       memory@0 {
+               device_type = "memory";
+               reg = <0 0x10000000>;
+       };
+
        leds {
                act {
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts
index b5782faabedf9fb011b424aa5bd525a87699bc9d..37e02a1c9e4a2191c6bba2dde87b10c6044a8696 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
@@ -9,6 +9,11 @@
        compatible = "raspberrypi,model-b", "brcm,bcm2835";
        model = "Raspberry Pi Model B";
 
+       memory@0 {
+               device_type = "memory";
+               reg = <0 0x10000000>;
+       };
+
        leds {
                act {
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;

diff --git a/arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi b/arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi
index ef22c2da783afe706548637ca0ca39c816c04e23..58059c2ce1294a8a6d0fb426b833498e6cfb6950 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi
+++ b/arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi
@@ -10,6 +10,11 @@
                };
        };
 
+       memory@0 {
+               device_type = "memory";
+               reg = <0 0x20000000>;
+       };
+
        reg_3v3: fixed-regulator {
                compatible = "regulator-fixed";
                regulator-name = "3V3";

diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
index 5ecc4032beb6808f753a73a0585a1eacd0021307..f38f388e44b47e9817c51f4a24583a20ebf01595 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
@@ -12,6 +12,11 @@
        compatible = "raspberrypi,model-zero-w", "brcm,bcm2835";
        model = "Raspberry Pi Zero W";
 
+       memory@0 {
+               device_type = "memory";
+               reg = <0 0x20000000>;
+       };
+
        chosen {
                /* 8250 auxiliary UART instead of pl011 */
                stdout-path = "serial1:115200n8";

diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero.dts b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
index 84c70354faf2aff3d88b9d3a2e29e547c074d4ad..5fd06869dfcf6f85a403ede13e72f96e08a993b7 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
@@ -12,6 +12,11 @@
        compatible = "raspberrypi,model-zero", "brcm,bcm2835";
        model = "Raspberry Pi Zero";
 
+       memory@0 {
+               device_type = "memory";
+               reg = <0 0x20000000>;
+       };
+
        leds {
                act {
                        gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
index 40bac52ecc3991cdd6e04edd9ec3ece68db2b0bf..f5125b7459861a64e910472e27efbb983fb544e9 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
@@ -1,11 +1,6 @@
 #include <dt-bindings/power/raspberrypi-power.h>
 
 / {
-       memory@0 {
-               device_type = "memory";
-               reg = <0 0x10000000>;
-       };
-
        leds {
                compatible = "gpio-leds";
 

diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
index f97ec9519104bf783c7b9270cb6a9a48a36ce4bf..6a89999f1976e22e113ef3a3fb48f6cd1d154898 100644 (file)
--- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
+++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
@@ -10,6 +10,7 @@
        model = "Raspberry Pi 2 Model B";
 
        memory@0 {
+               device_type = "memory";
                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 7f4437a8eedbe338e00332a3e7e82e1587aad874..0e29aaae3038a7761b6452050940eefa29c3d939 100644 (file)
--- a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
@@ -14,6 +14,7 @@
        };
 
        memory@0 {
+               device_type = "memory";
                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 c6fa34c24100d43f053f5b64a4e5b4a8e801da7f..a1487ae3db8df502ea9c259a7d0ebd5e305c8385 100644 (file)
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
@@ -15,6 +15,7 @@
        };
 
        memory@0 {
+               device_type = "memory";
                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 ce71f578c51a7b5a210aad098ad283292cba5317..a36bfdb5950afb4cc5daf5206fccfb4807a5ec8e 100644 (file)
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
@@ -15,6 +15,7 @@
        };
 
        memory@0 {
+               device_type = "memory";
                reg = <0 0x40000000>;
        };
 

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