summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/rk3036-kylin.dts
diff options
context:
space:
mode:
authorHeiko Stuebner2016-03-30 17:33:24 +0200
committerHeiko Stuebner2016-04-07 01:30:33 +0200
commitfbf15046f12d6c8d5821c0dc5bf3ffc55a132243 (patch)
treeb7af65297d02b7f342d301ac9c9a6ac352d71401 /arch/arm/boot/dts/rk3036-kylin.dts
parentARM: dts: rockchip: enable the eDP on rk3288 veyron devices (diff)
downloadkernel-qcow2-linux-fbf15046f12d6c8d5821c0dc5bf3ffc55a132243.tar.gz
kernel-qcow2-linux-fbf15046f12d6c8d5821c0dc5bf3ffc55a132243.tar.xz
kernel-qcow2-linux-fbf15046f12d6c8d5821c0dc5bf3ffc55a132243.zip
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>
Diffstat (limited to 'arch/arm/boot/dts/rk3036-kylin.dts')
-rw-r--r--arch/arm/boot/dts/rk3036-kylin.dts5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts
index 951f15d675c7..1df1557a46c3 100644
--- 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";