ARM: dts: rockchip: move rk3036 memory definition to board files

The amount of available memory is clearly a board-specific value, so
the core per-soc dtsi should not define a default of any sort.
Therefore move the memory-nodes to the two board files.

Also fix the amount of memory on Kylin (512MB instead of 1GB).
While in most cases the bootloader will override this with the
actual amount of memory, there is no need to keep known wrong values
in the board-dts.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm/boot/dts/rk3036-evb.dts b/arch/arm/boot/dts/rk3036-evb.dts
index b3d6ec87f6152b1e23c0845913990da1c19076a8..8db9e9b197a2875a5846b40c283b5607dabf73b6 100644 (file)
--- a/arch/arm/boot/dts/rk3036-evb.dts
+++ b/arch/arm/boot/dts/rk3036-evb.dts
@@ -45,6 +45,11 @@
 / {
        model = "Rockchip RK3036 Evaluation board";
        compatible = "rockchip,rk3036-evb", "rockchip,rk3036";
+
+       memory {
+               device_type = "memory";
+               reg = <0x60000000 0x40000000>;
+       };
 };
 
 &emac {

diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts
index 951f15d675c73b2c51225212ec5b2625756cd99a..1df1557a46c3534832d73c9604b3e8490bca9128 100644 (file)
--- a/arch/arm/boot/dts/rk3036-kylin.dts
+++ b/arch/arm/boot/dts/rk3036-kylin.dts
@@ -46,6 +46,11 @@
        model = "Rockchip RK3036 KylinBoard";
        compatible = "rockchip,rk3036-kylin", "rockchip,rk3036";
 
+       memory {
+               device_type = "memory";
+               reg = <0x60000000 0x20000000>;
+       };
+
        leds: gpio-leds {
                compatible = "gpio-leds";
 

diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index fa6b5cf31aa7f6b73ff332bfb9e77ab2a8426a15..843d2be2e4e912ad2ea19149583c9051b1100590 100644 (file)
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -63,11 +63,6 @@
                spi = &spi;
        };
 
-       memory {
-               device_type = "memory";
-               reg = <0x60000000 0x40000000>;
-       };
-
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;