[meta-ti] Jacob Stiffler : linux: cmem: Update reserved CMEM regions

[Arago Project git]

Module: meta-ti
Branch: fido
Commit: 60f57fbf323127996735380c14d4b1bfa93eb986
URL:    http://arago-project.org/git/meta-ti.git?a=commit;h=60f57fbf323127996735380c14d4b1bfa93eb986

Author: Jacob Stiffler <j-stiffler at ti.com>
Date:   Fri Jan 29 03:20:50 2016 +0000

linux: cmem: Update reserved CMEM regions

* dra7xx:
  - Increase DDR region required to pass OpenCL conformance
  - Add OCMC region
* k2e-evm, k2l-evm:
  - Add reserved regions for these machines

Signed-off-by: Jacob Stiffler <j-stiffler at ti.com>
Signed-off-by: Denys Dmytriyenko <denys at ti.com>

---

 recipes-kernel/linux/files/dra7xx/cmem.dtsi  |   20 ++++++++++--
 recipes-kernel/linux/files/k2e-evm/cmem.dtsi |   42 ++++++++++++++++++++++++++
 recipes-kernel/linux/files/k2l-evm/cmem.dtsi |   42 ++++++++++++++++++++++++++
 3 files changed, 101 insertions(+), 3 deletions(-)

diff --git a/recipes-kernel/linux/files/dra7xx/cmem.dtsi b/recipes-kernel/linux/files/dra7xx/cmem.dtsi
index d91faf9..c7781c4 100644
--- a/recipes-kernel/linux/files/dra7xx/cmem.dtsi
+++ b/recipes-kernel/linux/files/dra7xx/cmem.dtsi
@@ -1,10 +1,20 @@
 / {
         reserved-memory {
+                #address-cells = <2>;
+                #size-cells = <2>;
+                ranges;
+
                 cmem_block_mem_0: cmem_block_mem at a0000000 {
-                        reg = <0x0 0xa0000000 0x0 0x0a000000>;
+                        reg = <0x0 0xa0000000 0x0 0x0c000000>;
                         no-map;
                         status = "okay";
                 };
+
+		cmem_block_mem_1_ocmc3: cmem_block_mem at 40500000 {
+			reg = <0x0 0x40500000 0x0 0x100000>;
+			no-map;
+			status = "okay";
+		};
         };
 
         cmem {
@@ -19,8 +29,12 @@
                 cmem_block_0: cmem_block at 0 {
                         reg = <0>;
                         memory-region = <&cmem_block_mem_0>;
-                        cmem-buf-pools = <1 0x0 0x0a000000>;
+                        cmem-buf-pools = <1 0x0 0x0c000000>;
                 };
-        };
 
+		cmem_block_1: cmem_block at 1 {
+			reg = <1>;
+			memory-region = <&cmem_block_mem_1_ocmc3>;
+		};
+        };
 };
diff --git a/recipes-kernel/linux/files/k2e-evm/cmem.dtsi b/recipes-kernel/linux/files/k2e-evm/cmem.dtsi
new file mode 100644
index 0000000..236b0ba
--- /dev/null
+++ b/recipes-kernel/linux/files/k2e-evm/cmem.dtsi
@@ -0,0 +1,42 @@
+/ {
+	reserved-memory {
+		mpm_block_mem_0: mpm_block_mem at 820000000 {
+			reg = <0x00000008 0x20000000 0x00000000 0x02000000>;
+			no-map;
+			status = "okay";
+		};
+
+		cmem_block_mem_0: cmem_block_mem at 829000000 {
+			reg = <0x00000008 0x22000000 0x00000000 0x1E000000>;
+			no-map;
+			status = "okay";
+		};
+
+		cmem_block_mem_1: cmem_block_mem at 00c100000 {
+			reg = <0x00000000 0x0c000000 0x00000000 0x00180000>;
+			no-map;
+			status = "okay";
+		};
+	};
+
+	cmem {
+		compatible = "ti,cmem";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		#pool-size-cells = <2>;
+
+		status = "okay";
+
+		cmem_block_0: cmem_block at 0 {
+			reg = <0>;
+			memory-region = <&cmem_block_mem_0>;
+			cmem-buf-pools = <1 0x00000000 0x1E000000>;
+		};
+
+		cmem_block_1: cmem_block at 1 {
+			reg = <1>;
+			memory-region = <&cmem_block_mem_1>;
+		};
+	};
+};
diff --git a/recipes-kernel/linux/files/k2l-evm/cmem.dtsi b/recipes-kernel/linux/files/k2l-evm/cmem.dtsi
new file mode 100644
index 0000000..236b0ba
--- /dev/null
+++ b/recipes-kernel/linux/files/k2l-evm/cmem.dtsi
@@ -0,0 +1,42 @@
+/ {
+	reserved-memory {
+		mpm_block_mem_0: mpm_block_mem at 820000000 {
+			reg = <0x00000008 0x20000000 0x00000000 0x02000000>;
+			no-map;
+			status = "okay";
+		};
+
+		cmem_block_mem_0: cmem_block_mem at 829000000 {
+			reg = <0x00000008 0x22000000 0x00000000 0x1E000000>;
+			no-map;
+			status = "okay";
+		};
+
+		cmem_block_mem_1: cmem_block_mem at 00c100000 {
+			reg = <0x00000000 0x0c000000 0x00000000 0x00180000>;
+			no-map;
+			status = "okay";
+		};
+	};
+
+	cmem {
+		compatible = "ti,cmem";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		#pool-size-cells = <2>;
+
+		status = "okay";
+
+		cmem_block_0: cmem_block at 0 {
+			reg = <0>;
+			memory-region = <&cmem_block_mem_0>;
+			cmem-buf-pools = <1 0x00000000 0x1E000000>;
+		};
+
+		cmem_block_1: cmem_block at 1 {
+			reg = <1>;
+			memory-region = <&cmem_block_mem_1>;
+		};
+	};
+};