Merge tag 'clk-for-linus-3.12' of git://git.linaro.org/people/mturquette/linux

[cascardo/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 3f94fe8..caadc02 100644 (file)
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -36,6 +36,12 @@
                i2c5 = &i2c_5;
                i2c6 = &i2c_6;
                i2c7 = &i2c_7;
+               csis0 = &csis_0;
+               csis1 = &csis_1;
+               fimc0 = &fimc_0;
+               fimc1 = &fimc_1;
+               fimc2 = &fimc_2;
+               fimc3 = &fimc_3;
        };
 
        chipid@10000000 {
@@ -92,6 +98,88 @@
                reg = <0x10010000 0x400>;
        };
 
+       camera {
+               compatible = "samsung,fimc", "simple-bus";
+               status = "disabled";
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+
+               clock_cam: clock-controller {
+                        #clock-cells = <1>;
+               };
+
+               fimc_0: fimc@11800000 {
+                       compatible = "samsung,exynos4210-fimc";
+                       reg = <0x11800000 0x1000>;
+                       interrupts = <0 84 0>;
+                       clocks = <&clock 256>, <&clock 128>;
+                       clock-names = "fimc", "sclk_fimc";
+                       samsung,power-domain = <&pd_cam>;
+                       samsung,sysreg = <&sys_reg>;
+                       status = "disabled";
+               };
+
+               fimc_1: fimc@11810000 {
+                       compatible = "samsung,exynos4210-fimc";
+                       reg = <0x11810000 0x1000>;
+                       interrupts = <0 85 0>;
+                       clocks = <&clock 257>, <&clock 129>;
+                       clock-names = "fimc", "sclk_fimc";
+                       samsung,power-domain = <&pd_cam>;
+                       samsung,sysreg = <&sys_reg>;
+                       status = "disabled";
+               };
+
+               fimc_2: fimc@11820000 {
+                       compatible = "samsung,exynos4210-fimc";
+                       reg = <0x11820000 0x1000>;
+                       interrupts = <0 86 0>;
+                       clocks = <&clock 258>, <&clock 130>;
+                       clock-names = "fimc", "sclk_fimc";
+                       samsung,power-domain = <&pd_cam>;
+                       samsung,sysreg = <&sys_reg>;
+                       status = "disabled";
+               };
+
+               fimc_3: fimc@11830000 {
+                       compatible = "samsung,exynos4210-fimc";
+                       reg = <0x11830000 0x1000>;
+                       interrupts = <0 87 0>;
+                       clocks = <&clock 259>, <&clock 131>;
+                       clock-names = "fimc", "sclk_fimc";
+                       samsung,power-domain = <&pd_cam>;
+                       samsung,sysreg = <&sys_reg>;
+                       status = "disabled";
+               };
+
+               csis_0: csis@11880000 {
+                       compatible = "samsung,exynos4210-csis";
+                       reg = <0x11880000 0x4000>;
+                       interrupts = <0 78 0>;
+                       clocks = <&clock 260>, <&clock 134>;
+                       clock-names = "csis", "sclk_csis";
+                       bus-width = <4>;
+                       samsung,power-domain = <&pd_cam>;
+                       status = "disabled";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+               };
+
+               csis_1: csis@11890000 {
+                       compatible = "samsung,exynos4210-csis";
+                       reg = <0x11890000 0x4000>;
+                       interrupts = <0 80 0>;
+                       clocks = <&clock 261>, <&clock 135>;
+                       clock-names = "csis", "sclk_csis";
+                       bus-width = <2>;
+                       samsung,power-domain = <&pd_cam>;
+                       status = "disabled";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+               };
+       };
+
        watchdog@10060000 {
                compatible = "samsung,s3c2410-wdt";
                reg = <0x10060000 0x100>;
@@ -155,13 +243,31 @@
                status = "disabled";
        };
 
+       ehci@12580000 {
+               compatible = "samsung,exynos4210-ehci";
+               reg = <0x12580000 0x100>;
+               interrupts = <0 70 0>;
+               clocks = <&clock 304>;
+               clock-names = "usbhost";
+               status = "disabled";
+       };
+
+       ohci@12590000 {
+               compatible = "samsung,exynos4210-ohci";
+               reg = <0x12590000 0x100>;
+               interrupts = <0 70 0>;
+               clocks = <&clock 304>;
+               clock-names = "usbhost";
+               status = "disabled";
+       };
+
        mfc: codec@13400000 {
                compatible = "samsung,mfc-v5";
                reg = <0x13400000 0x10000>;
                interrupts = <0 94 0>;
                samsung,power-domain = <&pd_mfc>;
-               clocks = <&clock 170>, <&clock 273>;
-               clock-names = "sclk_mfc", "mfc";
+               clocks = <&clock 273>;
+               clock-names = "mfc";
                status = "disabled";
        };
 
@@ -297,8 +403,8 @@
                compatible = "samsung,exynos4210-spi";
                reg = <0x13920000 0x100>;
                interrupts = <0 66 0>;
-               tx-dma-channel = <&pdma0 7>; /* preliminary */
-               rx-dma-channel = <&pdma0 6>; /* preliminary */
+               dmas = <&pdma0 7>, <&pdma0 6>;
+               dma-names = "tx", "rx";
                #address-cells = <1>;
                #size-cells = <0>;
                clocks = <&clock 327>, <&clock 159>;
@@ -312,8 +418,8 @@
                compatible = "samsung,exynos4210-spi";
                reg = <0x13930000 0x100>;
                interrupts = <0 67 0>;
-               tx-dma-channel = <&pdma1 7>; /* preliminary */
-               rx-dma-channel = <&pdma1 6>; /* preliminary */
+               dmas = <&pdma1 7>, <&pdma1 6>;
+               dma-names = "tx", "rx";
                #address-cells = <1>;
                #size-cells = <0>;
                clocks = <&clock 328>, <&clock 160>;
@@ -327,8 +433,8 @@
                compatible = "samsung,exynos4210-spi";
                reg = <0x13940000 0x100>;
                interrupts = <0 68 0>;
-               tx-dma-channel = <&pdma0 9>; /* preliminary */
-               rx-dma-channel = <&pdma0 8>; /* preliminary */
+               dmas = <&pdma0 9>, <&pdma0 8>;
+               dma-names = "tx", "rx";
                #address-cells = <1>;
                #size-cells = <0>;
                clocks = <&clock 329>, <&clock 161>;
@@ -342,6 +448,8 @@
                compatible = "samsung,exynos4210-pwm";
                reg = <0x139D0000 0x1000>;
                interrupts = <0 37 0>, <0 38 0>, <0 39 0>, <0 40 0>, <0 41 0>;
+               clocks = <&clock 336>;
+               clock-names = "timers";
                #pwm-cells = <2>;
                status = "disabled";
        };