From 3abd1e3900979c6594625a063016dd9efc2a0888 Mon Sep 17 00:00:00 2001
From: CMY <cmy@rock-chips.com>
Date: Thu, 26 Jun 2014 18:01:34 +0800
Subject: [PATCH] rk: dts: more convenient to modify CMA region
---
arch/arm/boot/dts/rk3288-p977.dts | 19 +++----------------
arch/arm/boot/dts/rk3288.dtsi | 2 +-
2 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/arch/arm/boot/dts/rk3288-p977.dts b/arch/arm/boot/dts/rk3288-p977.dts
index fa69e5cef412..cf2b0df4e157 100755
--- 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 5657cbecf371..3bc9fde70be8 100755
--- 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 */
--
2.34.1