Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[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 15957227ffdaafb8679bf675d3c9e966e6d1697e..8617a031cbc06bf670e42f167056fe6c061b0d63 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,26 @@
                phy-names = "dp";
        };
 
+       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>;
+               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 {
-               samsung,power-domain = <&disp_pd>;
                clocks = <&clock CLK_SCLK_FIMD1>, <&clock CLK_FIMD1>;
                clock-names = "sclk_fimd", "fimd";
        };
@@ -727,6 +740,9 @@
        pmu_system_controller: system-controller@10040000 {
                compatible = "samsung,exynos5420-pmu", "syscon";
                reg = <0x10040000 0x5000>;
+               clock-names = "clkout16";
+               clocks = <&clock CLK_FIN_PLL>;
+               #clock-cells = <1>;
        };
 
        sysreg_system_controller: syscon@10050000 {
@@ -799,7 +815,7 @@
                #size-cells = <1>;
                ranges;
 
-               dwc3 {
+               usbdrd_dwc3_0: dwc3 {
                        compatible = "snps,dwc3";
                        reg = <0x12000000 0x10000>;
                        interrupts = <0 72 0>;
@@ -825,7 +841,7 @@
                #size-cells = <1>;
                ranges;
 
-               dwc3 {
+               usbdrd_dwc3_1: dwc3 {
                        compatible = "snps,dwc3";
                        reg = <0x12400000 0x10000>;
                        interrupts = <0 73 0>;