Merge branch 'master' of git://git.denx.de/u-boot-video

[u-boot] / arch / arm / dts / exynos4.dtsi

diff --git a/arch/arm/dts/exynos4.dtsi b/arch/arm/dts/exynos4.dtsi
index 6b8351607e1ad8bc0dbdf819ad7a1c390a0d9cf3..a5a00c8fd421f6f17e44bf125474074cda0878a4 100644 (file)
--- a/arch/arm/dts/exynos4.dtsi
+++ b/arch/arm/dts/exynos4.dtsi
@@ -10,6 +10,24 @@
 #include "skeleton.dtsi"
 
 / {
+       aliases {
+               i2c0 = &i2c_0;
+               i2c1 = &i2c_1;
+               i2c2 = &i2c_2;
+               i2c3 = &i2c_3;
+               i2c4 = &i2c_4;
+               i2c5 = &i2c_5;
+               i2c6 = &i2c_6;
+               i2c7 = &i2c_7;
+       };
+
+       combiner: interrupt-controller@10440000 {
+               compatible = "samsung,exynos4210-combiner";
+               #interrupt-cells = <2>;
+               interrupt-controller;
+               reg = <0x10440000 0x1000>;
+       };
+
        serial@13800000 {
                compatible = "samsung,exynos4210-uart";
                reg = <0x13800000 0x3c>;
@@ -40,60 +58,68 @@
                id = <4>;
        };
 
-       i2c@13860000 {
+       i2c_0: i2c@13860000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,s3c2440-i2c";
-               interrupts = <0 0 0>;
+               reg = <0x13860000 0x100>;
+               interrupts = <0 56 0>;
        };
 
-       i2c@13870000 {
+       i2c_1: i2c@13870000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,s3c2440-i2c";
-               interrupts = <1 1 0>;
+               reg = <0x13870000 0x100>;
+               interrupts = <1 57 0>;
        };
 
-       i2c@13880000 {
+       i2c_2: i2c@13880000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,s3c2440-i2c";
-               interrupts = <2 2 0>;
+               reg = <0x13880000 0x100>;
+               interrupts = <2 58 0>;
        };
 
-       i2c@13890000 {
+       i2c_3: i2c@13890000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,s3c2440-i2c";
-               interrupts = <3 3 0>;
+               reg = <0x13890000 0x100>;
+               interrupts = <3 59 0>;
        };
 
-       i2c@138a0000 {
+       i2c_4: i2c@138a0000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,s3c2440-i2c";
-               interrupts = <4 4 0>;
+               reg = <0x138a0000 0x100>;
+               interrupts = <4 60 0>;
        };
 
-       i2c@138b0000 {
+       i2c_5: i2c@138b0000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,s3c2440-i2c";
-               interrupts = <5 5 0>;
+               reg = <0x138b0000 0x100>;
+               interrupts = <5 61 0>;
        };
 
-       i2c@138c0000 {
+       i2c_6: i2c@138c0000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,s3c2440-i2c";
-               interrupts = <6 6 0>;
+               reg = <0x138c0000 0x100>;
+               interrupts = <6 62 0>;
        };
 
-       i2c@138d0000 {
+       i2c_7: i2c@138d0000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,s3c2440-i2c";
-               interrupts = <7 7 0>;
+               reg = <0x138d0000 0x100>;
+               interrupts = <7 63 0>;
        };
 
        sdhci@12510000 {
@@ -136,11 +162,4 @@
                interrupts = <0 131 0>;
        };
 
-       gpio: gpio {
-               gpio-controller;
-               #gpio-cells = <2>;
-
-               interrupt-controller;
-               #interrupt-cells = <2>;
-       };
 };