diff options
author | Sam Nelson <sam.nelson@ti.com> | 2016-12-16 01:55:53 +0000 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2016-12-16 12:44:44 -0500 |
commit | f9913896a7b674482cd02dda0543bac9bd8f6a69 (patch) | |
tree | 8f3c017b71a190cec639f859f98bdce3623e0336 /recipes-kernel | |
parent | d4be639847e6928ba189a222ec835f10086c75c7 (diff) | |
download | meta-ti-f9913896a7b674482cd02dda0543bac9bd8f6a69.tar.gz |
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@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'recipes-kernel')
-rw-r--r-- | 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 4716581e..4c68d82d 100644 --- a/recipes-kernel/linux/files/k2g/cmem.dtsi +++ b/recipes-kernel/linux/files/k2g/cmem.dtsi | |||
@@ -1,14 +1,8 @@ | |||
1 | / { | 1 | / { |
2 | reserved-memory { | 2 | reserved-memory { |
3 | 3 | ||
4 | cmem_block_mem_0: cmem_block_mem@829000000 { | 4 | cmem_block_mem_0: cmem_block_mem@818000000 { |
5 | reg = <0x00000008 0x29000000 0x00000000 0x17000000>; | 5 | reg = <0x00000008 0x18000000 0x00000000 0x5000000>; |
6 | no-map; | ||
7 | status = "okay"; | ||
8 | }; | ||
9 | |||
10 | cmem_block_mem_2: cmem_block_mem@822000000 { | ||
11 | reg = <0x00000008 0x22000000 0x00000000 0x07000000>; | ||
12 | no-map; | 6 | no-map; |
13 | status = "okay"; | 7 | status = "okay"; |
14 | }; | 8 | }; |
@@ -26,28 +20,16 @@ | |||
26 | cmem_block_0: cmem_block@0 { | 20 | cmem_block_0: cmem_block@0 { |
27 | reg = <0>; | 21 | reg = <0>; |
28 | memory-region = <&cmem_block_mem_0>; | 22 | memory-region = <&cmem_block_mem_0>; |
29 | cmem-buf-pools = <1 0x00000000 0x17000000>; | 23 | cmem-buf-pools = <1 0x00000000 0x5000000>; |
30 | }; | 24 | }; |
31 | 25 | ||
32 | cmem_block_1: cmem_block@1 { | 26 | cmem_block_1: cmem_block@1 { |
33 | reg = <1>; | 27 | reg = <1>; |
34 | sram = <&sram_cmem>; | 28 | sram = <&sram_cmem>; |
35 | }; | 29 | }; |
36 | |||
37 | cmem_block_2: cmem_block@2 { | ||
38 | reg = <2>; | ||
39 | memory-region = <&cmem_block_mem_2>; | ||
40 | }; | ||
41 | }; | 30 | }; |
42 | }; | 31 | }; |
43 | 32 | ||
44 | &dsp_common_mpm_area { | ||
45 | reg = <0x00000008 0x20000000 0x00000000 0x02000000>; | ||
46 | }; | ||
47 | &mpm_mem { | ||
48 | reg = <0xa0000000 0x02000000>; | ||
49 | }; | ||
50 | |||
51 | &msm_ram { | 33 | &msm_ram { |
52 | sram_cmem: sram-cmem@a0000 { | 34 | sram_cmem: sram-cmem@a0000 { |
53 | reg = <0xa0000 0x57000>; | 35 | reg = <0xa0000 0x57000>; |