From: Linus Walleij <linus.walleij@linaro.org>
Date: Thu, 26 Sep 2013 13:34:02 +0000 (+0200)
Subject: ARM: ux500: split HREF UIB files
X-Git-Tag: v3.13-rc1~156^2~11^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9c19cfa93a43803c5f40054f96bca28d439e0847;p=profile%2Fivi%2Fkernel-x86-ivi.git

ARM: ux500: split HREF UIB files

Create two different UIB (User Interface Board) include files: one per
UIB simply. The include files now only handle the devices on that
very UIB.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---

diff --git a/arch/arm/boot/dts/ste-stuib.dtsi b/arch/arm/boot/dts/ste-href-stuib.dtsi
similarity index 100%
rename from arch/arm/boot/dts/ste-stuib.dtsi
rename to arch/arm/boot/dts/ste-href-stuib.dtsi
diff --git a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
new file mode 100644
index 0000000..89e1485
--- /dev/null
+++ b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2012 ST-Ericsson AB
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * Device Tree for the TVK1281618 UIB
+ */
+
+#include <dt-bindings/interrupt-controller/irq.h>
+
+/ {
+	soc {
+		/* Add Synaptics touch screen, TC35892 keypad etc here */
+	};
+};
diff --git a/arch/arm/boot/dts/ste-hrefprev60.dts b/arch/arm/boot/dts/ste-hrefprev60.dts
index 5016dc9..85c6dd4 100644
--- a/arch/arm/boot/dts/ste-hrefprev60.dts
+++ b/arch/arm/boot/dts/ste-hrefprev60.dts
@@ -12,7 +12,8 @@
 /dts-v1/;
 #include "ste-dbx5x0.dtsi"
 #include "ste-href.dtsi"
-#include "ste-stuib.dtsi"
+#include "ste-href-stuib.dtsi"
+#include "ste-href-tvk1281618.dtsi"
 
 / {
 	model = "ST-Ericsson HREF (pre-v60) platform with Device Tree";
diff --git a/arch/arm/boot/dts/ste-hrefv60plus.dts b/arch/arm/boot/dts/ste-hrefv60plus.dts
index b82ae50..0f222e1 100644
--- a/arch/arm/boot/dts/ste-hrefv60plus.dts
+++ b/arch/arm/boot/dts/ste-hrefv60plus.dts
@@ -12,7 +12,8 @@
 /dts-v1/;
 #include "ste-dbx5x0.dtsi"
 #include "ste-href.dtsi"
-#include "ste-stuib.dtsi"
+#include "ste-href-stuib.dtsi"
+#include "ste-href-tvk1281618.dtsi"
 
 / {
 	model = "ST-Ericsson HREF (v60+) platform with Device Tree";