diff options
| author | Heiko Stuebner <heiko@sntech.de> | 2016-03-30 17:33:24 +0200 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2016-04-06 16:30:33 -0700 |
| commit | fbf15046f12d6c8d5821c0dc5bf3ffc55a132243 (patch) | |
| tree | b7af65297d02b7f342d301ac9c9a6ac352d71401 | |
| parent | 37aedb29b9f053215a5a0dfb15ecc49af67c1fbc (diff) | |
| download | linux-fbf15046f12d6c8d5821c0dc5bf3ffc55a132243.tar.bz2 | |
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>
| -rw-r--r-- | arch/arm/boot/dts/rk3036-evb.dts | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/rk3036-kylin.dts | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/rk3036.dtsi | 5 |
3 files changed, 10 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/rk3036-evb.dts b/arch/arm/boot/dts/rk3036-evb.dts index b3d6ec87f615..8db9e9b197a2 100644 --- 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 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"; diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi index fa6b5cf31aa7..843d2be2e4e9 100644 --- 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>; |