From b835ff8ef5a02698a5c5b96890a0791490edbd0a Mon Sep 17 00:00:00 2001
From: Sam Nelson <sam.nelson@ti.com>
Date: Fri, 16 Dec 2016 01:55:52 +0000
Subject: [PATCH] recipes-kernel:cmem.dtsi:Keystone2: Update to remove
 redefinition of mpm areas

Cleaning up redefinition of mpm areas and moving to use what is defined
in the base device tree files as is.
This effectively changes to a new memory partition.
Note that this change needs a corresponding change in the dts files in
the kernel tree to adjust the mpm memory area to the new memory
partition.

The CMEM areas here are adjusted such that there is no overlap with the
mpm areas defined in the dts files in the kernel tree.

Also fixes issue with K2L, by removing overlapping memory area section.

Signed-off-by: Sam Nelson <sam.nelson@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 recipes-kernel/linux/files/k2e/cmem.dtsi      | 13 +++-------
 recipes-kernel/linux/files/k2hk-evm/cmem.dtsi | 24 +++----------------
 recipes-kernel/linux/files/k2l-evm/cmem.dtsi  | 19 +++------------
 3 files changed, 9 insertions(+), 47 deletions(-)

diff --git a/recipes-kernel/linux/files/k2e/cmem.dtsi b/recipes-kernel/linux/files/k2e/cmem.dtsi
index 2a2909a1..c233768d 100644
--- a/recipes-kernel/linux/files/k2e/cmem.dtsi
+++ b/recipes-kernel/linux/files/k2e/cmem.dtsi
@@ -1,7 +1,7 @@
 / {
 	reserved-memory {
-		cmem_block_mem_0: cmem_block_mem@829000000 {
-			reg = <0x00000008 0x22000000 0x00000000 0x1E000000>;
+		cmem_block_mem_0: cmem_block_mem@830000000 {
+			reg = <0x00000008 0x30000000 0x00000000 0x18000000>;
 			no-map;
 			status = "okay";
 		};
@@ -19,7 +19,7 @@
 		cmem_block_0: cmem_block@0 {
 			reg = <0>;
 			memory-region = <&cmem_block_mem_0>;
-			cmem-buf-pools = <1 0x00000000 0x1E000000>;
+			cmem-buf-pools = <1 0x00000000 0x18000000>;
 		};
 
 		cmem_block_1: cmem_block@1 {
@@ -29,13 +29,6 @@
 	};
 };
 
-&dsp_common_mpm_area {
-	reg = <0x00000008 0x20000000 0x00000000 0x02000000>;
-};
-&mpm_mem {
-	reg = <0xa0000000 0x02000000>;
-};
-
 &msm_ram {
 	sram_cmem: sram-cmem@80000 {
 		reg = <0x80000 0xc0000>;
diff --git a/recipes-kernel/linux/files/k2hk-evm/cmem.dtsi b/recipes-kernel/linux/files/k2hk-evm/cmem.dtsi
index e5927bac..400aa9dd 100644
--- a/recipes-kernel/linux/files/k2hk-evm/cmem.dtsi
+++ b/recipes-kernel/linux/files/k2hk-evm/cmem.dtsi
@@ -1,14 +1,8 @@
 / {
 	reserved-memory {
 
-		cmem_block_mem_0: cmem_block_mem@829000000 {
-			reg = <0x00000008 0x29000000 0x00000000 0x17000000>;
-			no-map;
-			status = "okay";
-		};
-
-		cmem_block_mem_2: cmem_block_mem@822000000 {
-			reg = <0x00000008 0x22000000 0x00000000 0x07000000>;
+		cmem_block_mem_0: cmem_block_mem@830000000 {
+			reg = <0x00000008 0x30000000 0x00000000 0x18000000>;
 			no-map;
 			status = "okay";
 		};
@@ -26,28 +20,16 @@
 		cmem_block_0: cmem_block@0 {
 			reg = <0>;
 			memory-region = <&cmem_block_mem_0>;
-			cmem-buf-pools = <1 0x00000000 0x17000000>;
+			cmem-buf-pools = <1 0x00000000 0x18000000>;
 		};
 
 		cmem_block_1: cmem_block@1 {
 			reg = <1>;
 			sram = <&sram_cmem>;
 		};
-
-		cmem_block_2: cmem_block@2 {
-			reg = <2>;
-			memory-region = <&cmem_block_mem_2>;
-		 };
 	};
 };
 
-&dsp_common_mpm_area {
-	reg = <0x00000008 0x20000000 0x00000000 0x02000000>;
-};
-&mpm_mem {
-	reg = <0xa0000000 0x02000000>;
-};
-
 &msm_ram {
 	sram_cmem: sram-cmem@100000 {
 		reg = <0x100000 0x480000>;
diff --git a/recipes-kernel/linux/files/k2l-evm/cmem.dtsi b/recipes-kernel/linux/files/k2l-evm/cmem.dtsi
index 8b09642c..da389e5d 100644
--- a/recipes-kernel/linux/files/k2l-evm/cmem.dtsi
+++ b/recipes-kernel/linux/files/k2l-evm/cmem.dtsi
@@ -1,14 +1,8 @@
 / {
 	reserved-memory {
 
-		cmem_block_mem_0: cmem_block_mem@829000000 {
-			reg = <0x00000008 0x22000000 0x00000000 0x1E000000>;
-			no-map;
-			status = "okay";
-		};
-
-		cmem_block_mem_1: cmem_block_mem@00c080000 {
-			reg = <0x00000000 0x0c080000 0x00000000 0x000c0000>;
+		cmem_block_mem_0: cmem_block_mem@830000000 {
+			reg = <0x00000008 0x30000000 0x00000000 0x18000000>;
 			no-map;
 			status = "okay";
 		};
@@ -26,7 +20,7 @@
 		cmem_block_0: cmem_block@0 {
 			reg = <0>;
 			memory-region = <&cmem_block_mem_0>;
-			cmem-buf-pools = <1 0x00000000 0x1E000000>;
+			cmem-buf-pools = <1 0x00000000 0x18000000>;
 		};
 
 		cmem_block_1: cmem_block@1 {
@@ -36,13 +30,6 @@
 	};
 };
 
-&dsp_common_mpm_area {
-	reg = <0x00000008 0x20000000 0x00000000 0x02000000>;
-};
-&mpm_mem {
-	reg = <0xa0000000 0x02000000>;
-};
-
 &msm_ram {
 	sram_cmem: sram-cmem@80000 {
 		reg = <0x80000 0xc0000>;