From b7fb4e7c55325043b8430234600499be8133aede Mon Sep 17 00:00:00 2001 From: qjb Date: Tue, 13 Jan 2015 19:21:28 +0800 Subject: [PATCH] rk3288 sec dts : modify ion drm config --- arch/arm/boot/dts/rk3288-tb_sec.dts | 13 +++++-------- arch/arm/boot/dts/rk3288.dtsi | 5 +++++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/rk3288-tb_sec.dts b/arch/arm/boot/dts/rk3288-tb_sec.dts index 038b1cec9236..b9cb31328b41 100755 --- a/arch/arm/boot/dts/rk3288-tb_sec.dts +++ b/arch/arm/boot/dts/rk3288-tb_sec.dts @@ -9,16 +9,13 @@ cpu_off = <0x84000002>; cpu_on = <0x84000003>; migrate = <0x84000005>; - }; - - ion { - ion_drm: rockchip,ion-heap@5 { - compatible = "rockchip,ion-heap"; - rockchip,ion_heap = <5>; - reg = <0x78000000 0x08000000 0x00400000>; - }; + }; }; +&ion_drm { + compatible = "rockchip,ion-heap"; + rockchip,ion_heap = <5>; + reg = <0x78000000 0x08000000 0x00400000>; }; &uart_dbg { diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index a1d7c4bde5db..22e8d2cb82da 100755 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -978,6 +978,11 @@ #address-cells = <1>; #size-cells = <0>; + ion_drm: rockchip,ion-heap@5 { + compatible = "rockchip,ion-heap"; + rockchip,ion_heap = <5>; + reg = <0x00000000 0x00000000>; + }; ion_cma: rockchip,ion-heap@4 { /* CMA HEAP */ compatible = "rockchip,ion-heap"; rockchip,ion_heap = <4>; -- 2.34.1