Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

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

diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index a40a5c2b5a4ff1a776a74e3fe24be0284140b8b9..95ec37dff3e85fca734a36061072d6ef07444224 100644 (file)
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -265,11 +265,6 @@
                clock-names = "oscclk", "pclk0", "clk0";
        };
 
-       disp_pd: power-domain@100440C0 {
-               compatible = "samsung,exynos4210-pd";
-               reg = <0x100440C0 0x20>;
-       };
-
        msc_pd: power-domain@10044120 {
                compatible = "samsung,exynos4210-pd";
                reg = <0x10044120 0x20>;
@@ -520,8 +515,27 @@
                phy-names = "dp";
        };
 
-       fimd: fimd@14400000 {
+       mipi_phy: video-phy@10040714 {
+               compatible = "samsung,s5pv210-mipi-video-phy";
+               reg = <0x10040714 12>;
+               #phy-cells = <1>;
+       };
+
+       dsi@14500000 {
+               compatible = "samsung,exynos5410-mipi-dsi";
+               reg = <0x14500000 0x10000>;
+               interrupts = <0 82 0>;
                samsung,power-domain = <&disp_pd>;
+               phys = <&mipi_phy 1>;
+               phy-names = "dsim";
+               clocks = <&clock CLK_DSIM1>, <&clock CLK_SCLK_MIPI1>;
+               clock-names = "bus_clk", "pll_clk";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               status = "disabled";
+       };
+
+       fimd: fimd@14400000 {
                clocks = <&clock CLK_SCLK_FIMD1>, <&clock CLK_FIMD1>;
                clock-names = "sclk_fimd", "fimd";
        };