rk: ion: cma reserve 640MB at anywhere by default on rk32xx

diff --git a/arch/arm/boot/dts/rk3288-p977.dts b/arch/arm/boot/dts/rk3288-p977.dts
index cb6e92fbff7de7eaeafe486212092d6cd22ebda5..405e3022c5814cc756032db497dc50b7976df213 100755 (executable)
--- a/arch/arm/boot/dts/rk3288-p977.dts
+++ b/arch/arm/boot/dts/rk3288-p977.dts
@@ -764,6 +764,3 @@
 &sdmmc0_vdd_domain{
        regulator-name = "vcc_sd";                      
        };
-&ion_cma {
-       reg = <0x40000000 0x20000000>; /* 512MB */
-};

diff --git a/arch/arm/boot/dts/rk3288-p977_8846.dts b/arch/arm/boot/dts/rk3288-p977_8846.dts
index f4b403189b5c12852a9df17b1e96a2200f5e1d64..4e20b449b67524fb5f935b145dc95d4c2408f07a 100755 (executable)
--- a/arch/arm/boot/dts/rk3288-p977_8846.dts
+++ b/arch/arm/boot/dts/rk3288-p977_8846.dts
@@ -935,6 +935,3 @@
 &sdmmc0_vdd_domain{
        regulator-name = "vcc_sd";                      
        };
-&ion_cma {
-       reg = <0x40000000 0x20000000>; /* 512MB */
-};

diff --git a/arch/arm/boot/dts/rk3288-tb.dts b/arch/arm/boot/dts/rk3288-tb.dts
index 12c24d322a5ff693164ef74fbb300b4dbc06748a..fde9d45df930678a1e922a34244c3a19144a03b4 100755 (executable)
--- a/arch/arm/boot/dts/rk3288-tb.dts
+++ b/arch/arm/boot/dts/rk3288-tb.dts
@@ -1380,10 +1380,6 @@
        regulator-name = "vcc_sd";                      
        };
 
-&ion_cma {
-       reg = <0x40000000 0x28000000>; /* 640MB */
-};
-
 &dwc_control_usb {
        usb_uart {
                status = "disabled";

diff --git a/arch/arm/boot/dts/rk3288-tb_8846.dts b/arch/arm/boot/dts/rk3288-tb_8846.dts
index e8e718edb33730ab6b2ac7c3cd9604a1fed6b548..0c2c19a17d18d9977e152f0b0ee3f11743da5039 100644 (file)
--- a/arch/arm/boot/dts/rk3288-tb_8846.dts
+++ b/arch/arm/boot/dts/rk3288-tb_8846.dts
@@ -1055,10 +1055,6 @@
        regulator-name = "vcc_sd";                      
        };
 
-&ion_cma {
-       reg = <0x40000000 0x28000000>; /* 640MB */
-};
-
 &dwc_control_usb {
        usb_uart {
                status = "disabled";

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 2e893ea2bc6d46fcabf5cdab741dd357014ef864..9b89fc141fe9170334e9e94607c9c2679e5c8b0c 100755 (executable)
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -981,7 +981,7 @@
                ion_cma: rockchip,ion-heap@1 { /* CMA HEAP */
                        compatible = "rockchip,ion-heap";
                        rockchip,ion_heap = <1>;
-                       reg = <0x00000000 0x20000000>; /* 512MB */
+                       reg = <0x00000000 0x28000000>; /* 640MB */
                };
                rockchip,ion-heap@3 { /* VMALLOC HEAP */
                        compatible = "rockchip,ion-heap";