From 102c4181a729eed48def0044369a3e9b685d3d75 Mon Sep 17 00:00:00 2001 From: Sam Nelson Date: Sat, 3 Dec 2016 07:18:40 +0000 Subject: [PATCH] recipes-kernel: cmem.dtsi: Update memory sections for DDR and MSMC cmem.dtsi splits the already defined dsp_common_mpm_area DDR memory into a smaller MPM segment and other CMEM blocks. The mpm_block_mem is removed and instead the original memory sections dsp_common_mpm_area and mpm_mem in the kernel dtb are updated to reflect On the MSMC memory, cmem.dtsi defines a sram subnode instead of the reserved memory. mpm MSMC areas are already captured in the kernel dtb. Signed-off-by: Sam Nelson Signed-off-by: Denys Dmytriyenko --- recipes-kernel/linux/files/k2e/cmem.dtsi | 27 +++--- recipes-kernel/linux/files/k2g/cmem.dtsi | 87 ++++++++++--------- recipes-kernel/linux/files/k2hk-evm/cmem.dtsi | 87 ++++++++++--------- recipes-kernel/linux/files/k2l-evm/cmem.dtsi | 20 +++-- 4 files changed, 116 insertions(+), 105 deletions(-) diff --git a/recipes-kernel/linux/files/k2e/cmem.dtsi b/recipes-kernel/linux/files/k2e/cmem.dtsi index 4c8e785e..2a2909a1 100644 --- a/recipes-kernel/linux/files/k2e/cmem.dtsi +++ b/recipes-kernel/linux/files/k2e/cmem.dtsi @@ -1,22 +1,10 @@ / { reserved-memory { - mpm_block_mem_0: mpm_block_mem@820000000 { - reg = <0x00000008 0x20000000 0x00000000 0x02000000>; - no-map; - status = "okay"; - }; - 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>; - no-map; - status = "okay"; - }; }; cmem { @@ -36,7 +24,20 @@ cmem_block_1: cmem_block@1 { reg = <1>; - memory-region = <&cmem_block_mem_1>; + sram = <&sram_cmem>; }; }; }; + +&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/k2g/cmem.dtsi b/recipes-kernel/linux/files/k2g/cmem.dtsi index f30bf5ba..4716581e 100644 --- a/recipes-kernel/linux/files/k2g/cmem.dtsi +++ b/recipes-kernel/linux/files/k2g/cmem.dtsi @@ -1,54 +1,55 @@ / { - reserved-memory { - mpm_block_mem_0: mpm_block_mem@820000000 { - reg = <0x00000008 0x20000000 0x00000000 0x02000000>; - no-map; - status = "okay"; - }; + reserved-memory { - cmem_block_mem_0: cmem_block_mem@829000000 { - reg = <0x00000008 0x29000000 0x00000000 0x17000000>; - no-map; - status = "okay"; - }; + cmem_block_mem_0: cmem_block_mem@829000000 { + reg = <0x00000008 0x29000000 0x00000000 0x17000000>; + no-map; + status = "okay"; + }; - cmem_block_mem_1: cmem_block_mem@00c000000 { - reg = <0x00000000 0x0c000000 0x00000000 0x00100000>; - no-map; - status = "okay"; - }; + cmem_block_mem_2: cmem_block_mem@822000000 { + reg = <0x00000008 0x22000000 0x00000000 0x07000000>; + no-map; + status = "okay"; + }; + }; - cmem_block_mem_2: cmem_block_mem@822000000 { - reg = <0x00000008 0x22000000 0x00000000 0x07000000>; - no-map; - status = "okay"; - }; - }; - - cmem { - compatible = "ti,cmem"; - #address-cells = <1>; - #size-cells = <0>; + cmem { + compatible = "ti,cmem"; + #address-cells = <1>; + #size-cells = <0>; #pool-size-cells = <2>; - status = "okay"; + status = "okay"; - cmem_block_0: cmem_block@0 { - reg = <0>; - memory-region = <&cmem_block_mem_0>; - cmem-buf-pools = <1 0x00000000 0x17000000>; - }; + cmem_block_0: cmem_block@0 { + reg = <0>; + memory-region = <&cmem_block_mem_0>; + cmem-buf-pools = <1 0x00000000 0x17000000>; + }; - cmem_block_1: cmem_block@1 { - reg = <1>; - memory-region = <&cmem_block_mem_1>; - }; - - cmem_block_2: cmem_block@2 { - reg = <2>; - memory-region = <&cmem_block_mem_2>; - }; - }; + 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>; + }; }; diff --git a/recipes-kernel/linux/files/k2hk-evm/cmem.dtsi b/recipes-kernel/linux/files/k2hk-evm/cmem.dtsi index 98e9e7c7..e5927bac 100644 --- a/recipes-kernel/linux/files/k2hk-evm/cmem.dtsi +++ b/recipes-kernel/linux/files/k2hk-evm/cmem.dtsi @@ -1,54 +1,55 @@ / { - reserved-memory { - mpm_block_mem_0: mpm_block_mem@820000000 { - reg = <0x00000008 0x20000000 0x00000000 0x02000000>; - no-map; - status = "okay"; - }; + reserved-memory { - cmem_block_mem_0: cmem_block_mem@829000000 { - reg = <0x00000008 0x29000000 0x00000000 0x17000000>; - no-map; - status = "okay"; - }; + cmem_block_mem_0: cmem_block_mem@829000000 { + reg = <0x00000008 0x29000000 0x00000000 0x17000000>; + no-map; + status = "okay"; + }; - cmem_block_mem_1: cmem_block_mem@00c100000 { - reg = <0x00000000 0x0c100000 0x00000000 0x00480000>; - no-map; - status = "okay"; - }; + cmem_block_mem_2: cmem_block_mem@822000000 { + reg = <0x00000008 0x22000000 0x00000000 0x07000000>; + no-map; + status = "okay"; + }; + }; - cmem_block_mem_2: cmem_block_mem@822000000 { - reg = <0x00000008 0x22000000 0x00000000 0x07000000>; - no-map; - status = "okay"; - }; - }; - - cmem { - compatible = "ti,cmem"; - #address-cells = <1>; - #size-cells = <0>; + cmem { + compatible = "ti,cmem"; + #address-cells = <1>; + #size-cells = <0>; #pool-size-cells = <2>; - status = "okay"; + status = "okay"; - cmem_block_0: cmem_block@0 { - reg = <0>; - memory-region = <&cmem_block_mem_0>; - cmem-buf-pools = <1 0x00000000 0x17000000>; - }; + cmem_block_0: cmem_block@0 { + reg = <0>; + memory-region = <&cmem_block_mem_0>; + cmem-buf-pools = <1 0x00000000 0x17000000>; + }; - cmem_block_1: cmem_block@1 { - reg = <1>; - memory-region = <&cmem_block_mem_1>; - }; - - cmem_block_2: cmem_block@2 { - reg = <2>; - memory-region = <&cmem_block_mem_2>; - }; - }; + 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 4c8e785e..8b09642c 100644 --- a/recipes-kernel/linux/files/k2l-evm/cmem.dtsi +++ b/recipes-kernel/linux/files/k2l-evm/cmem.dtsi @@ -1,10 +1,5 @@ / { reserved-memory { - mpm_block_mem_0: mpm_block_mem@820000000 { - reg = <0x00000008 0x20000000 0x00000000 0x02000000>; - no-map; - status = "okay"; - }; cmem_block_mem_0: cmem_block_mem@829000000 { reg = <0x00000008 0x22000000 0x00000000 0x1E000000>; @@ -36,7 +31,20 @@ cmem_block_1: cmem_block@1 { reg = <1>; - memory-region = <&cmem_block_mem_1>; + sram = <&sram_cmem>; }; }; }; + +&dsp_common_mpm_area { + reg = <0x00000008 0x20000000 0x00000000 0x02000000>; +}; +&mpm_mem { + reg = <0xa0000000 0x02000000>; +}; + +&msm_ram { + sram_cmem: sram-cmem@80000 { + reg = <0x80000 0xc0000>; + }; +};