From: CMY <cmy@rock-chips.com>
Date: Thu, 11 Dec 2014 04:53:29 +0000 (+0800)
Subject: rk: ion: cma reserve 640MB at anywhere by default on rk32xx
X-Git-Tag: firefly_0821_release~4395
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6c7783c2bfd2c0fbfcfec7ec106af0e1b2614e57;p=firefly-linux-kernel-4.4.55.git

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 cb6e92fbff7d..405e3022c581 100755
--- 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 f4b403189b5c..4e20b449b675 100755
--- 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 12c24d322a5f..fde9d45df930 100755
--- 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 e8e718edb337..0c2c19a17d18 100644
--- 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 2e893ea2bc6d..9b89fc141fe9 100755
--- 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";