aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSundar Raman2013-06-03 13:32:53 -0500
committerSundar Raman2013-07-26 16:00:24 -0500
commit7d7ad5311aca079575ef1278ef3812c833d9f775 (patch)
tree46afb7ba8b9334f6e496ea2b0c3af49906274dcd
parent3d84b522bf60b9dae8215b85f641a690f89fa652 (diff)
downloadkernel-video-7d7ad5311aca079575ef1278ef3812c833d9f775.tar.gz
kernel-video-7d7ad5311aca079575ef1278ef3812c833d9f775.tar.xz
kernel-video-7d7ad5311aca079575ef1278ef3812c833d9f775.zip
ARM: dts: DRA7/OMAP5: reserve carveout buffers & fix carveout size
Carveout buffers were initialized but not reserved for DRA7. This patch adds the missing memreserves without which there could be data corruption in highmem region. In addition, the carveout size for TILER secure heap was programmed wrongly to 96MB whereas it should have been 81 MB. This patch fixes this and re-adjusts the carveout base addresses. Change-Id: I151bd37f089aa7fbf590035ea4f612f1da12f53a Signed-off-by: Sundar Raman <a0393242@ti.com>
-rwxr-xr-xarch/arm/boot/dts/dra7-evm.dts12
-rw-r--r--arch/arm/boot/dts/omap5-uevm.dts8
2 files changed, 16 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index 880c57fd40c..b8fd69852d2 100755
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -7,6 +7,18 @@
7 */ 7 */
8/dts-v1/; 8/dts-v1/;
9 9
10/*
11 * Following are the carveout addresses and the sizes for ION. SMC is not reserved for now
12 * C0000000 - SDRAM+1G
13 * BFD00000 - SMC (3MB)
14 * BA300000 - ION (90MB)
15 * B4300000 - TILER SECURE (81 MB)
16 * B3400000 - TILER NONSECURE (15 MB)
17*/
18/memreserve/ 0xba300000 0x5a00000;
19/memreserve/ 0xb5200000 0x5100000;
20/memreserve/ 0xb4300000 0xf00000;
21
10/include/ "dra7.dtsi" 22/include/ "dra7.dtsi"
11 23
12/ { 24/ {
diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts
index a339f321c2a..5694a6fc052 100644
--- a/arch/arm/boot/dts/omap5-uevm.dts
+++ b/arch/arm/boot/dts/omap5-uevm.dts
@@ -8,16 +8,16 @@
8/dts-v1/; 8/dts-v1/;
9 9
10/* 10/*
11 * Following are the carveout addresses and the sizes. SMC is not reserved for now 11 * Following are the carveout addresses and the sizes for ION. SMC is not reserved for now
12 * C0000000 - SDRAM+1G 12 * C0000000 - SDRAM+1G
13 * BFD00000 - SMC (3MB) 13 * BFD00000 - SMC (3MB)
14 * BA300000 - ION (90MB) 14 * BA300000 - ION (90MB)
15 * B4300000 - TILER SECURE (96 MB) 15 * B4300000 - TILER SECURE (81 MB)
16 * B3400000 - TILER NONSECURE (15 MB) 16 * B3400000 - TILER NONSECURE (15 MB)
17*/ 17*/
18/memreserve/ 0xba300000 0x5a00000; 18/memreserve/ 0xba300000 0x5a00000;
19/memreserve/ 0xb4300000 0x6000000; 19/memreserve/ 0xb5200000 0x5100000;
20/memreserve/ 0xb3400000 0xf00000; 20/memreserve/ 0xb4300000 0xf00000;
21 21
22/include/ "omap5.dtsi" 22/include/ "omap5.dtsi"
23/include/ "samsung_k3pe0e000b.dtsi" 23/include/ "samsung_k3pe0e000b.dtsi"