Merge tag 'clk-for-linus-3.18' of git://git.linaro.org/people/mike.turquette/linux

[pandora-kernel.git] / arch / arm / boot / dts / exynos3250.dtsi

diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi
index 1d52de6..693a327 100644 (file)
--- a/arch/arm/boot/dts/exynos3250.dtsi
+++ b/arch/arm/boot/dts/exynos3250.dtsi
@@ -132,6 +132,12 @@
                        reg = <0x10020000 0x4000>;
                };
 
+               mipi_phy: video-phy@10020710 {
+                       compatible = "samsung,s5pv210-mipi-video-phy";
+                       reg = <0x10020710 8>;
+                       #phy-cells = <1>;
+               };
+
                pd_cam: cam-power-domain@10023C00 {
                        compatible = "samsung,exynos4210-pd";
                        reg = <0x10023C00 0x20>;
@@ -163,8 +169,14 @@
                        #clock-cells = <1>;
                };
 
+               cmu_dmc: clock-controller@105C0000 {
+                       compatible = "samsung,exynos3250-cmu-dmc";
+                       reg = <0x105C0000 0x2000>;
+                       #clock-cells = <1>;
+               };
+
                rtc: rtc@10070000 {
-                       compatible = "samsung,s3c6410-rtc";
+                       compatible = "samsung,exynos3250-rtc";
                        reg = <0x10070000 0x100>;
                        interrupts = <0 73 0>, <0 74 0>;
                        status = "disabled";
@@ -216,6 +228,33 @@
                        interrupts = <0 240 0>;
                };
 
+               fimd: fimd@11c00000 {
+                       compatible = "samsung,exynos3250-fimd";
+                       reg = <0x11c00000 0x30000>;
+                       interrupt-names = "fifo", "vsync", "lcd_sys";
+                       interrupts = <0 84 0>, <0 85 0>, <0 86 0>;
+                       clocks = <&cmu CLK_SCLK_FIMD0>, <&cmu CLK_FIMD0>;
+                       clock-names = "sclk_fimd", "fimd";
+                       samsung,power-domain = <&pd_lcd0>;
+                       samsung,sysreg = <&sys_reg>;
+                       status = "disabled";
+               };
+
+               dsi_0: dsi@11C80000 {
+                       compatible = "samsung,exynos3250-mipi-dsi";
+                       reg = <0x11C80000 0x10000>;
+                       interrupts = <0 83 0>;
+                       samsung,phy-type = <0>;
+                       samsung,power-domain = <&pd_lcd0>;
+                       phys = <&mipi_phy 1>;
+                       phy-names = "dsim";
+                       clocks = <&cmu CLK_DSIM0>, <&cmu CLK_SCLK_MIPI0>;
+                       clock-names = "bus_clk", "pll_clk";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
+
                mshc_0: mshc@12510000 {
                        compatible = "samsung,exynos5250-dw-mshc";
                        reg = <0x12510000 0x1000>;