Merge remote-tracking branch 'lightnvm/for-next'

[deliverable/linux.git] / arch / arm / boot / dts / rk3036-evb.dts

diff --git a/arch/arm/boot/dts/rk3036-evb.dts b/arch/arm/boot/dts/rk3036-evb.dts
index 8db9e9b197a2875a5846b40c283b5607dabf73b6..2f5f15524fbaec1d63193638948185405cc0ca05 100644 (file)
--- a/arch/arm/boot/dts/rk3036-evb.dts
+++ b/arch/arm/boot/dts/rk3036-evb.dts
@@ -46,7 +46,7 @@
        model = "Rockchip RK3036 Evaluation board";
        compatible = "rockchip,rk3036-evb", "rockchip,rk3036";
 
-       memory {
+       memory@60000000 {
                device_type = "memory";
                reg = <0x60000000 0x40000000>;
        };