Skip to contentSkip to conversation

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

PATCH New Heiko Stuebner 1 participant 2 messages Mar 31, 2016 – Apr 6, 2016

Subsystems (2)
Device tree bindings Arm Rockchip
lore
Share & tools
lore

Heiko Stuebner

author maintainer
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 arch/arm/boot/dts/rk3036-evb.dts   | 5 +++++
 arch/arm/boot/dts/rk3036-kylin.dts | 5 +++++
 arch/arm/boot/dts/rk3036.dtsi      | 5 -----
 3 files changed, 10 insertions(+), 5 deletions(-)
arch/arm/boot/dts/rk3036-evb.dts +5 -0
index b3d6ec8..8db9e9b 100644
@@ -45,6 +45,11 @@
 / {
 	model = "Rockchip RK3036 Evaluation board";
 	compatible = "rockchip,rk3036-evb", "rockchip,rk3036";
+
+	memory {
+		device_type = "memory";
+		reg = <0x60000000 0x40000000>;
+	};
 };
 
 &emac {
arch/arm/boot/dts/rk3036-kylin.dts +5 -0
index 6251d10..819d608 100644
@@ -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";
arch/arm/boot/dts/rk3036.dtsi +0 -5
index d0f4bb7..eb44a33 100644
@@ -63,11 +63,6 @@
 		spi = &spi;
 	};
 
-	memory {
-		device_type = "memory";
-		reg = <0x60000000 0x40000000>;
-	};
-
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
Signature · 1 line
2.6.4
author maintainer Applied
#1 lore raw

PATCH 1/1 ARM: dts: rockchip: move rk3036 memory definition to board files

Am Donnerstag, 31. M?rz 2016, 15:50:38 schrieb Heiko Stuebner:

Quoted 10 lines

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 <[email protected]>

applied to my dts32 branch for 4.7