summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-kernel/linux/cmem.inc3
-rw-r--r--recipes-kernel/linux/files/0001-ARM-dts-keystone-Remove-reg-entry-from-the-sram-node.patch79
2 files changed, 0 insertions, 82 deletions
diff --git a/recipes-kernel/linux/cmem.inc b/recipes-kernel/linux/cmem.inc
index 649b59d5..d4edc607 100644
--- a/recipes-kernel/linux/cmem.inc
+++ b/recipes-kernel/linux/cmem.inc
@@ -24,9 +24,6 @@ CMEM_DEVICETREE_dra74x = "dra7-evm.dtb dra7-evm-lcd-lg.dtb dra7-evm-lcd-osd.dtb
24# Flag to enable CMEM injection 24# Flag to enable CMEM injection
25RESERVE_CMEM ?= "0" 25RESERVE_CMEM ?= "0"
26 26
27# Need to patch main keystone dtsi files sram entry
28SRC_URI_append_keystone = "${@base_conditional("RESERVE_CMEM", "1", " file://0001-ARM-dts-keystone-Remove-reg-entry-from-the-sram-node.patch", "", d)}"
29
30# Add correct cmem.dtsi to SRC_URI for each variant for a given machine 27# Add correct cmem.dtsi to SRC_URI for each variant for a given machine
31python() { 28python() {
32 old_overrides = d.getVar('OVERRIDES', False) 29 old_overrides = d.getVar('OVERRIDES', False)
diff --git a/recipes-kernel/linux/files/0001-ARM-dts-keystone-Remove-reg-entry-from-the-sram-node.patch b/recipes-kernel/linux/files/0001-ARM-dts-keystone-Remove-reg-entry-from-the-sram-node.patch
deleted file mode 100644
index 18139869..00000000
--- a/recipes-kernel/linux/files/0001-ARM-dts-keystone-Remove-reg-entry-from-the-sram-node.patch
+++ /dev/null
@@ -1,79 +0,0 @@
1From c7e576590e45f9fb86a9d74fa66b4fd4f8eca803 Mon Sep 17 00:00:00 2001
2From: Sam Nelson <sam.nelson@ti.com>
3Date: Fri, 11 Nov 2016 10:32:48 -0500
4Subject: [PATCH] ARM: dts: keystone: Remove reg entry from the sram node
5
6Currently the reg entry reserves the whole MSMC ram range to be used
7only through the mmio-sram driver. (See LCPD-7801)
8
9Given that other modules (like CMEM) also currently reserve memory from
10MSMC, the reg entry which takes over the whole memory breaks those
11functionality. So currently recommending to remove this for now.
12Still the ranges entry will capture the total memory available.
13
14This will allow module like CMEM to reserve and use a non-overlapping
15section of memory not marked reserved by the sub nodes here.
16
17Resolves current issue with CMEM module reporting error allocating MSMC
18memory.
19
20Signed-off-by: Sam Nelson <sam.nelson@ti.com>
21Signed-off-by: Denys Dmytriyenko <denys@ti.com>
22---
23 arch/arm/boot/dts/keystone-k2e.dtsi | 1 -
24 arch/arm/boot/dts/keystone-k2g.dtsi | 1 -
25 arch/arm/boot/dts/keystone-k2hk.dtsi | 1 -
26 arch/arm/boot/dts/keystone-k2l.dtsi | 1 -
27 4 files changed, 4 deletions(-)
28
29diff --git a/arch/arm/boot/dts/keystone-k2e.dtsi b/arch/arm/boot/dts/keystone-k2e.dtsi
30index 553c423..5b9252a 100644
31--- a/arch/arm/boot/dts/keystone-k2e.dtsi
32+++ b/arch/arm/boot/dts/keystone-k2e.dtsi
33@@ -98,7 +98,6 @@
34
35 msm_ram: msmram@0c000000 {
36 compatible = "mmio-sram";
37- reg = <0x0c000000 0x200000>;
38 ranges = <0x0 0x0c000000 0x200000>;
39 #address-cells = <1>;
40 #size-cells = <1>;
41diff --git a/arch/arm/boot/dts/keystone-k2g.dtsi b/arch/arm/boot/dts/keystone-k2g.dtsi
42index 45faf40..e953d82 100644
43--- a/arch/arm/boot/dts/keystone-k2g.dtsi
44+++ b/arch/arm/boot/dts/keystone-k2g.dtsi
45@@ -99,7 +99,6 @@
46
47 msm_ram: msmram@0c000000 {
48 compatible = "mmio-sram";
49- reg = <0x0c000000 0x100000>;
50 ranges = <0x0 0x0c000000 0x100000>;
51 #address-cells = <1>;
52 #size-cells = <1>;
53diff --git a/arch/arm/boot/dts/keystone-k2hk.dtsi b/arch/arm/boot/dts/keystone-k2hk.dtsi
54index edca6aa..f3f1932 100644
55--- a/arch/arm/boot/dts/keystone-k2hk.dtsi
56+++ b/arch/arm/boot/dts/keystone-k2hk.dtsi
57@@ -111,7 +111,6 @@
58
59 msm_ram: msmram@0c000000 {
60 compatible = "mmio-sram";
61- reg = <0x0c000000 0x600000>;
62 ranges = <0x0 0x0c000000 0x600000>;
63 #address-cells = <1>;
64 #size-cells = <1>;
65diff --git a/arch/arm/boot/dts/keystone-k2l.dtsi b/arch/arm/boot/dts/keystone-k2l.dtsi
66index 76caff6..4ee7439 100644
67--- a/arch/arm/boot/dts/keystone-k2l.dtsi
68+++ b/arch/arm/boot/dts/keystone-k2l.dtsi
69@@ -284,7 +284,6 @@
70
71 msm_ram: msmram@0c000000 {
72 compatible = "mmio-sram";
73- reg = <0x0c000000 0x200000>;
74 ranges = <0x0 0x0c000000 0x200000>;
75 #address-cells = <1>;
76 #size-cells = <1>;
77--
782.7.4
79