aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishal Mahaveer2016-03-15 17:16:42 -0500
committerVishal Mahaveer2016-03-15 17:16:42 -0500
commit9a1e03d0e8fb7b025eaed7a8357294145c9f497b (patch)
tree7f93dafade2b2e5b63189124db433ad0b595665c
parentd6ed6f695f1603bd89b8ab67908fefd1aa1e443e (diff)
parent5f46899279c629d1da1a6575785bc83896865ce2 (diff)
downloadkernel-video-9a1e03d0e8fb7b025eaed7a8357294145c9f497b.tar.gz
kernel-video-9a1e03d0e8fb7b025eaed7a8357294145c9f497b.tar.xz
kernel-video-9a1e03d0e8fb7b025eaed7a8357294145c9f497b.zip
Merge branch 'p-ti-linux-3.14.y-common' into p-ti-linux-3.14.y-android
* p-ti-linux-3.14.y-common: Revert "dts: Add DTS files for HS parts/platforms" Change-Id: Idd73b8e5df9383ca8ec96906d9d053fd241739df Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
-rw-r--r--arch/arm/boot/dts/Makefile3
-rw-r--r--arch/arm/boot/dts/dra7-hs-evm-lcd10.dts11
-rw-r--r--arch/arm/boot/dts/dra7-hs-evm-lcd7.dts10
-rw-r--r--arch/arm/boot/dts/dra7-hs-evm.dts14
-rw-r--r--arch/arm/boot/dts/dra7-hs.dtsi34
5 files changed, 0 insertions, 72 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index e35b1074d46..ea9c2c739f1 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -246,9 +246,6 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
246 dra7-evm-lcd7-late-attach.dtb \ 246 dra7-evm-lcd7-late-attach.dtb \
247 dra7-evm-lcd7-late-attach-no-map.dtb \ 247 dra7-evm-lcd7-late-attach-no-map.dtb \
248 dra7-evm-vision.dtb \ 248 dra7-evm-vision.dtb \
249 dra7-hs-evm.dtb \
250 dra7-hs-evm-lcd7.dtb \
251 dra7-hs-evm-lcd10.dtb \
252 dra72-evm.dtb \ 249 dra72-evm.dtb \
253 dra72-evm-lcd7.dtb \ 250 dra72-evm-lcd7.dtb \
254 dra72-evm-lcd10.dtb \ 251 dra72-evm-lcd10.dtb \
diff --git a/arch/arm/boot/dts/dra7-hs-evm-lcd10.dts b/arch/arm/boot/dts/dra7-hs-evm-lcd10.dts
deleted file mode 100644
index 1bc1163474a..00000000000
--- a/arch/arm/boot/dts/dra7-hs-evm-lcd10.dts
+++ /dev/null
@@ -1,11 +0,0 @@
1/*
2 * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 2 as
6 * published by the Free Software Foundation.
7 */
8
9#include "dra7-evm-lcd10.dts"
10#include "dra7-hs.dtsi"
11
diff --git a/arch/arm/boot/dts/dra7-hs-evm-lcd7.dts b/arch/arm/boot/dts/dra7-hs-evm-lcd7.dts
deleted file mode 100644
index f79c94a824d..00000000000
--- a/arch/arm/boot/dts/dra7-hs-evm-lcd7.dts
+++ /dev/null
@@ -1,10 +0,0 @@
1/*
2 * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 2 as
6 * published by the Free Software Foundation.
7 */
8
9#include "dra7-evm-lcd7.dts"
10#include "dra7-hs.dtsi"
diff --git a/arch/arm/boot/dts/dra7-hs-evm.dts b/arch/arm/boot/dts/dra7-hs-evm.dts
deleted file mode 100644
index 4482726f632..00000000000
--- a/arch/arm/boot/dts/dra7-hs-evm.dts
+++ /dev/null
@@ -1,14 +0,0 @@
1/*
2 * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 2 as
6 * published by the Free Software Foundation.
7 * Based on "omap4.dtsi"
8 */
9
10#include "dra7-evm.dts"
11#include "dra7-hs.dtsi"
12
13
14
diff --git a/arch/arm/boot/dts/dra7-hs.dtsi b/arch/arm/boot/dts/dra7-hs.dtsi
deleted file mode 100644
index 58fb40d4ba5..00000000000
--- a/arch/arm/boot/dts/dra7-hs.dtsi
+++ /dev/null
@@ -1,34 +0,0 @@
1/*
2 * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 2 as
6 * published by the Free Software Foundation.
7 * Based on "omap4.dtsi"
8 */
9
10/ {
11 reserved-memory {
12 /* Required by SMC tf_driver */
13 sec_rsvd: sec_rsvd@94C00000 {
14 compatible = "sec-rsvd";
15 reg = <0x94c00000 0x800000>;
16 no-map;
17 status = "okay";
18 };
19 };
20};
21
22/* Alter reserved IRQ mappings to not mess up
23 * secure world FIQs
24 */
25&crossbar_mpu {
26 ti,irqs-skip = <8 10 15 118 133 139 140>;
27};
28
29/* Disable the TRNG since it is owned by the secure world */
30&rng {
31 status = "disabled";
32};
33
34