From 47e2a2e97a9da758cbe39d97057f7d5adbda6af6 Mon Sep 17 00:00:00 2001 From: Sam Nelson Date: Fri, 16 Dec 2016 01:55:53 +0000 Subject: 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 Signed-off-by: Denys Dmytriyenko --- recipes-kernel/linux/files/k2g/cmem.dtsi | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) (limited to 'recipes-kernel') diff --git a/recipes-kernel/linux/files/k2g/cmem.dtsi b/recipes-kernel/linux/files/k2g/cmem.dtsi index 4716581e..4c68d82d 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@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@818000000 { + reg = <0x00000008 0x18000000 0x00000000 0x5000000>; 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 0x5000000>; }; 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@a0000 { reg = <0xa0000 0x57000>; -- cgit v1.2.3-54-g00ecf