[meta-ti] Sam Nelson : recipes-kernel: cmem.dtsi: Update memory sections for DDR and MSMC
Arago Project git
git at arago-project.org
Tue Dec 6 16:47:17 PST 2016
Module: meta-ti
Branch: krogoth
Commit: a8af1cd2e614b3692512eb600acd4ec1c2a11133
URL: http://arago-project.org/git/meta-ti.git?a=commit;h=a8af1cd2e614b3692512eb600acd4ec1c2a11133
Author: Sam Nelson <sam.nelson at ti.com>
Date: Sat Dec 3 07:18:40 2016 +0000
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 <sam.nelson at ti.com>
Signed-off-by: Denys Dmytriyenko <denys at ti.com>
---
recipes-kernel/linux/files/k2e/cmem.dtsi | 27 ++++----
recipes-kernel/linux/files/k2g/cmem.dtsi | 91 +++++++++++++------------
recipes-kernel/linux/files/k2hk-evm/cmem.dtsi | 91 +++++++++++++------------
recipes-kernel/linux/files/k2l-evm/cmem.dtsi | 20 ++++--
4 files changed, 120 insertions(+), 109 deletions(-)
diff --git a/recipes-kernel/linux/files/k2e/cmem.dtsi b/recipes-kernel/linux/files/k2e/cmem.dtsi
index 4c8e785..2a2909a 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 at 820000000 {
- reg = <0x00000008 0x20000000 0x00000000 0x02000000>;
- no-map;
- status = "okay";
- };
-
cmem_block_mem_0: cmem_block_mem at 829000000 {
reg = <0x00000008 0x22000000 0x00000000 0x1E000000>;
no-map;
status = "okay";
};
-
- cmem_block_mem_1: cmem_block_mem at 00c080000 {
- reg = <0x00000000 0x0c080000 0x00000000 0x000c0000>;
- no-map;
- status = "okay";
- };
};
cmem {
@@ -36,7 +24,20 @@
cmem_block_1: cmem_block at 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 at 80000 {
+ reg = <0x80000 0xc0000>;
+ };
+};
diff --git a/recipes-kernel/linux/files/k2g/cmem.dtsi b/recipes-kernel/linux/files/k2g/cmem.dtsi
index f30bf5b..4716581 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 at 820000000 {
- reg = <0x00000008 0x20000000 0x00000000 0x02000000>;
- no-map;
- status = "okay";
- };
-
- cmem_block_mem_0: cmem_block_mem at 829000000 {
- reg = <0x00000008 0x29000000 0x00000000 0x17000000>;
- no-map;
- status = "okay";
- };
-
- cmem_block_mem_1: cmem_block_mem at 00c000000 {
- reg = <0x00000000 0x0c000000 0x00000000 0x00100000>;
- no-map;
- status = "okay";
- };
-
- cmem_block_mem_2: cmem_block_mem at 822000000 {
- reg = <0x00000008 0x22000000 0x00000000 0x07000000>;
- no-map;
- status = "okay";
- };
- };
-
- cmem {
- compatible = "ti,cmem";
- #address-cells = <1>;
- #size-cells = <0>;
+ 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>;
+ no-map;
+ status = "okay";
+ };
+ };
+
+ cmem {
+ compatible = "ti,cmem";
+ #address-cells = <1>;
+ #size-cells = <0>;
#pool-size-cells = <2>;
- status = "okay";
+ status = "okay";
- cmem_block_0: cmem_block at 0 {
- reg = <0>;
- memory-region = <&cmem_block_mem_0>;
- cmem-buf-pools = <1 0x00000000 0x17000000>;
- };
+ cmem_block_0: cmem_block at 0 {
+ reg = <0>;
+ memory-region = <&cmem_block_mem_0>;
+ cmem-buf-pools = <1 0x00000000 0x17000000>;
+ };
- cmem_block_1: cmem_block at 1 {
- reg = <1>;
- memory-region = <&cmem_block_mem_1>;
- };
+ 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>;
- };
- };
+ 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>;
+ };
};
diff --git a/recipes-kernel/linux/files/k2hk-evm/cmem.dtsi b/recipes-kernel/linux/files/k2hk-evm/cmem.dtsi
index 98e9e7c..e5927ba 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 at 820000000 {
- reg = <0x00000008 0x20000000 0x00000000 0x02000000>;
- no-map;
- status = "okay";
- };
-
- cmem_block_mem_0: cmem_block_mem at 829000000 {
- reg = <0x00000008 0x29000000 0x00000000 0x17000000>;
- no-map;
- status = "okay";
- };
-
- cmem_block_mem_1: cmem_block_mem at 00c100000 {
- reg = <0x00000000 0x0c100000 0x00000000 0x00480000>;
- no-map;
- status = "okay";
- };
-
- cmem_block_mem_2: cmem_block_mem at 822000000 {
- reg = <0x00000008 0x22000000 0x00000000 0x07000000>;
- no-map;
- status = "okay";
- };
- };
-
- cmem {
- compatible = "ti,cmem";
- #address-cells = <1>;
- #size-cells = <0>;
+ 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>;
+ no-map;
+ status = "okay";
+ };
+ };
+
+ cmem {
+ compatible = "ti,cmem";
+ #address-cells = <1>;
+ #size-cells = <0>;
#pool-size-cells = <2>;
- status = "okay";
+ status = "okay";
- cmem_block_0: cmem_block at 0 {
- reg = <0>;
- memory-region = <&cmem_block_mem_0>;
- cmem-buf-pools = <1 0x00000000 0x17000000>;
- };
+ cmem_block_0: cmem_block at 0 {
+ reg = <0>;
+ memory-region = <&cmem_block_mem_0>;
+ cmem-buf-pools = <1 0x00000000 0x17000000>;
+ };
- cmem_block_1: cmem_block at 1 {
- reg = <1>;
- memory-region = <&cmem_block_mem_1>;
- };
+ 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>;
- };
- };
+ 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 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 4c8e785..8b09642 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 at 820000000 {
- reg = <0x00000008 0x20000000 0x00000000 0x02000000>;
- no-map;
- status = "okay";
- };
cmem_block_mem_0: cmem_block_mem at 829000000 {
reg = <0x00000008 0x22000000 0x00000000 0x1E000000>;
@@ -36,7 +31,20 @@
cmem_block_1: cmem_block at 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 at 80000 {
+ reg = <0x80000 0xc0000>;
+ };
+};
More information about the meta-ti
mailing list