rk: dts: more convenient to modify CMA region

diff --git a/arch/arm/boot/dts/rk3288-p977.dts b/arch/arm/boot/dts/rk3288-p977.dts
index fa69e5cef4121738db819c0905e075265e09fdfb..cf2b0df4e157fb69e9569b77460503ba42f86ffc 100755 (executable)
--- a/arch/arm/boot/dts/rk3288-p977.dts
+++ b/arch/arm/boot/dts/rk3288-p977.dts
@@ -156,21 +156,6 @@
         chosen {
                 bootargs = "vmalloc=512M";
         };
-
-        ion {
-                compatible = "rockchip,ion";
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                rockchip,ion-heap@1 { /* CMA HEAP */
-                        compatible = "rockchip,ion-reserve";
-                        rockchip,ion_heap = <1>;
-                        reg = <0x40000000 0x20000000>; /* 512MB */
-                };
-                rockchip,ion-heap@3 { /* VMALLOC HEAP */
-                        rockchip,ion_heap = <3>;
-                };
-        };
 };
 &pinctrl {
        gpio0_gpio {
@@ -772,4 +757,6 @@
 &sdmmc0_vdd_domain{
        regulator-name = "vcc_sd";                      
        };
-       
+&ion_cma {
+       reg = <0x40000000 0x20000000>; /* 512MB */
+};

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 5657cbecf37108548a0d35bd142f4990ebec53bf..3bc9fde70be8b0cb02e7e301760e3c47d4aca456 100755 (executable)
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -971,7 +971,7 @@
                #address-cells = <1>;
                #size-cells = <0>;
 
-               rockchip,ion-heap@1 { /* CMA HEAP */
+               ion_cma: rockchip,ion-heap@1 { /* CMA HEAP */
                        compatible = "rockchip,ion-reserve";
                        rockchip,ion_heap = <1>;
                        reg = <0x00000000 0x20000000>; /* 512MB */