Merge git://git.kvack.org/~bcrl/aio-next

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / exynos4212.dtsi

diff --git a/arch/arm/boot/dts/exynos4212.dtsi b/arch/arm/boot/dts/exynos4212.dtsi
index 94a43f9a05e2684a4fc311404b4c46d72afe4e4e..3c00e6ec93027f8ca410c1ee39b3b5d3200c3cd7 100644 (file)
--- a/arch/arm/boot/dts/exynos4212.dtsi
+++ b/arch/arm/boot/dts/exynos4212.dtsi
@@ -20,18 +20,13 @@
 #include "exynos4x12.dtsi"
 
 / {
-       compatible = "samsung,exynos4212";
+       compatible = "samsung,exynos4212", "samsung,exynos4";
 
-       gic: interrupt-controller@10490000 {
-               cpu-offset = <0x8000>;
+       combiner: interrupt-controller@10440000 {
+               samsung,combiner-nr = <18>;
        };
 
-       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>;
+       gic: interrupt-controller@10490000 {
+               cpu-offset = <0x8000>;
        };
 };