[meta-ti] Sam Nelson : recipes-kernel:cmem.dtsi:K2G: Update to remove redefinition of mpm areas

[Arago Project git]

Module: meta-ti
Branch: master
Commit: 836656c25c62da330186b6641bd3525a21d49649
URL:    http://arago-project.org/git/meta-ti.git?a=commit;h=836656c25c62da330186b6641bd3525a21d49649

Author: Sam Nelson <sam.nelson at ti.com>
Date:   Fri Dec 16 01:55:53 2016 +0000

recipes-kernel:cmem.dtsi:K2G: 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.
Note also the address ranges are arranged differently for K2G compared
to  the other Keystone platforms.
(This is to accomodate common memory map for multiple k2g platforms)

Signed-off-by: Sam Nelson <sam.nelson at ti.com>
Signed-off-by: Denys Dmytriyenko <denys at ti.com>

---

 recipes-kernel/linux/files/k2g/cmem.dtsi |   24 +++---------------------
 1 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/recipes-kernel/linux/files/k2g/cmem.dtsi b/recipes-kernel/linux/files/k2g/cmem.dtsi
index 4716581..4c68d82 100644
--- a/recipes-kernel/linux/files/k2g/cmem.dtsi
+++ b/recipes-kernel/linux/files/k2g/cmem.dtsi
@@ -1,14 +1,8 @@
 / {
 	reserved-memory {
 
-		cmem_block_mem_0: cmem_block_mem at 829000000 {
-			reg = <0x00000008 0x29000000 0x00000000 0x17000000>;
-			no-map;
-			status = "okay";
-		};
-
-		cmem_block_mem_2: cmem_block_mem at 822000000 {
-			reg = <0x00000008 0x22000000 0x00000000 0x07000000>;
+		cmem_block_mem_0: cmem_block_mem at 818000000 {
+			reg = <0x00000008 0x18000000 0x00000000 0x5000000>;
 			no-map;
 			status = "okay";
 		};
@@ -26,28 +20,16 @@
 		cmem_block_0: cmem_block at 0 {
 			reg = <0>;
 			memory-region = <&cmem_block_mem_0>;
-			cmem-buf-pools = <1 0x00000000 0x17000000>;
+			cmem-buf-pools = <1 0x00000000 0x5000000>;
 		};
 
 		cmem_block_1: cmem_block at 1 {
 			reg = <1>;
 			sram = <&sram_cmem>;
 		};
-
-		cmem_block_2: cmem_block at 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 at a0000 {
 		reg = <0xa0000 0x57000>;