Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / arch / arm / boot / dts / exynos4.dtsi

diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index a26c3dd582695f8d5d59cf98a7eb252d5a4f2cfc..e1347fceb5bc44c269e62d85c97a36249a76a073 100644 (file)
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -28,6 +28,44 @@
                spi0 = &spi_0;
                spi1 = &spi_1;
                spi2 = &spi_2;
+               i2c0 = &i2c_0;
+               i2c1 = &i2c_1;
+               i2c2 = &i2c_2;
+               i2c3 = &i2c_3;
+               i2c4 = &i2c_4;
+               i2c5 = &i2c_5;
+               i2c6 = &i2c_6;
+               i2c7 = &i2c_7;
+       };
+
+       pd_mfc: mfc-power-domain@10023C40 {
+               compatible = "samsung,exynos4210-pd";
+               reg = <0x10023C40 0x20>;
+       };
+
+       pd_g3d: g3d-power-domain@10023C60 {
+               compatible = "samsung,exynos4210-pd";
+               reg = <0x10023C60 0x20>;
+       };
+
+       pd_lcd0: lcd0-power-domain@10023C80 {
+               compatible = "samsung,exynos4210-pd";
+               reg = <0x10023C80 0x20>;
+       };
+
+       pd_tv: tv-power-domain@10023C20 {
+               compatible = "samsung,exynos4210-pd";
+               reg = <0x10023C20 0x20>;
+       };
+
+       pd_cam: cam-power-domain@10023C00 {
+               compatible = "samsung,exynos4210-pd";
+               reg = <0x10023C00 0x20>;
+       };
+
+       pd_gps: gps-power-domain@10023CE0 {
+               compatible = "samsung,exynos4210-pd";
+               reg = <0x10023CE0 0x20>;
        };
 
        gic:interrupt-controller@10490000 {
@@ -121,7 +159,7 @@
                status = "disabled";
        };
 
-       i2c@13860000 {
+       i2c_0: i2c@13860000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,s3c2440-i2c";
@@ -130,7 +168,7 @@
                status = "disabled";
        };
 
-       i2c@13870000 {
+       i2c_1: i2c@13870000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,s3c2440-i2c";
@@ -139,7 +177,7 @@
                status = "disabled";
        };
 
-       i2c@13880000 {
+       i2c_2: i2c@13880000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,s3c2440-i2c";
@@ -148,7 +186,7 @@
                status = "disabled";
        };
 
-       i2c@13890000 {
+       i2c_3: i2c@13890000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,s3c2440-i2c";
@@ -157,7 +195,7 @@
                status = "disabled";
        };
 
-       i2c@138A0000 {
+       i2c_4: i2c@138A0000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,s3c2440-i2c";
@@ -166,7 +204,7 @@
                status = "disabled";
        };
 
-       i2c@138B0000 {
+       i2c_5: i2c@138B0000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,s3c2440-i2c";
@@ -175,7 +213,7 @@
                status = "disabled";
        };
 
-       i2c@138C0000 {
+       i2c_6: i2c@138C0000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,s3c2440-i2c";
@@ -184,7 +222,7 @@
                status = "disabled";
        };
 
-       i2c@138D0000 {
+       i2c_7: i2c@138D0000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "samsung,s3c2440-i2c";
@@ -244,5 +282,11 @@
                        reg = <0x12690000 0x1000>;
                        interrupts = <0 36 0>;
                };
+
+               mdma1: mdma@12850000 {
+                       compatible = "arm,pl330", "arm,primecell";
+                       reg = <0x12850000 0x1000>;
+                       interrupts = <0 34 0>;
+               };
        };
 };