From 2625888d58e4dab0870fb48a94335fdb2dee5986 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 12 Apr 2013 15:15:58 +0200
Subject: [PATCH] --- yaml --- r: 374211 b: refs/heads/master c:
 30269ddff13f417677a27e37086c97a57f1cf2da h: refs/heads/master i:   374209:
 40d2fdab433ddde4b7718e6f846cc1a604f548b4   374207:
 72b2e4dc9c9ac02298aa2c8de8e81d6af82c64f9 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/arm/boot/dts/exynos4210.dtsi | 1 +
 trunk/arch/arm/boot/dts/exynos4212.dtsi | 9 +++++++++
 trunk/arch/arm/boot/dts/exynos4412.dtsi | 9 +++++++++
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 079d09f5c8bb..ad8af81fd234 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 034c097ca27fb163754ee4f4e26f85559bece69b
+refs/heads/master: 30269ddff13f417677a27e37086c97a57f1cf2da
diff --git a/trunk/arch/arm/boot/dts/exynos4210.dtsi b/trunk/arch/arm/boot/dts/exynos4210.dtsi
index 15143bdbafb8..5feccffae409 100644
--- a/trunk/arch/arm/boot/dts/exynos4210.dtsi
+++ b/trunk/arch/arm/boot/dts/exynos4210.dtsi
@@ -41,6 +41,7 @@
 	};
 
 	combiner:interrupt-controller@10440000 {
+		samsung,combiner-nr = <16>;
 		interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>,
 			     <0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>,
 			     <0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>,
diff --git a/trunk/arch/arm/boot/dts/exynos4212.dtsi b/trunk/arch/arm/boot/dts/exynos4212.dtsi
index 36d4299789ef..c0f60f49cea6 100644
--- a/trunk/arch/arm/boot/dts/exynos4212.dtsi
+++ b/trunk/arch/arm/boot/dts/exynos4212.dtsi
@@ -26,6 +26,15 @@
 		cpu-offset = <0x8000>;
 	};
 
+	interrupt-controller@10440000 {
+		samsung,combiner-nr = <18>;
+		interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>,
+			     <0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>,
+			     <0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>,
+			     <0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>,
+			     <0 107 0>, <0 108 0>;
+	};
+
 	mct@10050000 {
 		compatible = "samsung,exynos4412-mct";
 		reg = <0x10050000 0x800>;
diff --git a/trunk/arch/arm/boot/dts/exynos4412.dtsi b/trunk/arch/arm/boot/dts/exynos4412.dtsi
index d75c047e80a9..f433206bd3c5 100644
--- a/trunk/arch/arm/boot/dts/exynos4412.dtsi
+++ b/trunk/arch/arm/boot/dts/exynos4412.dtsi
@@ -26,6 +26,15 @@
 		cpu-offset = <0x4000>;
 	};
 
+	interrupt-controller@10440000 {
+		samsung,combiner-nr = <20>;
+		interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>,
+			     <0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>,
+			     <0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>,
+			     <0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>,
+			     <0 107 0>, <0 108 0>, <0 48 0>, <0 42 0>;
+	};
+
 	mct@10050000 {
 		compatible = "samsung,exynos4412-mct";
 		reg = <0x10050000 0x800>;