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

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

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index f2dfa6b1f1a103cc6aabf3d0a6a3cc5fc89f4d27..f7e2d3493f82d556fd66b88fd6bc6a3549300b5e 100644 (file)
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -163,11 +163,21 @@
                clock-names = "watchdog";
        };
 
+       g2d@10850000 {
+               compatible = "samsung,exynos5250-g2d";
+               reg = <0x10850000 0x1000>;
+               interrupts = <0 91 0>;
+               clocks = <&clock 345>;
+               clock-names = "fimg2d";
+       };
+
        codec@11000000 {
                compatible = "samsung,mfc-v6";
                reg = <0x11000000 0x10000>;
                interrupts = <0 96 0>;
                samsung,power-domain = <&pd_mfc>;
+               clocks = <&clock 266>;
+               clock-names = "mfc";
        };
 
        rtc {
@@ -611,28 +621,20 @@
                interrupts = <0 94 0>;
        };
 
-       dp-controller {
-               compatible = "samsung,exynos5-dp";
-               reg = <0x145b0000 0x1000>;
-               interrupts = <10 3>;
-               interrupt-parent = <&combiner>;
+       dp_phy: video-phy@10040720 {
+               compatible = "samsung,exynos5250-dp-video-phy";
+               reg = <0x10040720 4>;
+               #phy-cells = <0>;
+       };
+
+       dp-controller@145B0000 {
                clocks = <&clock 342>;
                clock-names = "dp";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               dptx-phy {
-                       reg = <0x10040720>;
-                       samsung,enable-mask = <1>;
-               };
+               phys = <&dp_phy>;
+               phy-names = "dp";
        };
 
-       fimd {
-               compatible = "samsung,exynos5250-fimd";
-               interrupt-parent = <&combiner>;
-               reg = <0x14400000 0x40000>;
-               interrupt-names = "fifo", "vsync", "lcd_sys";
-               interrupts = <18 4>, <18 5>, <18 6>;
+       fimd@14400000 {
                clocks = <&clock 133>, <&clock 339>;
                clock-names = "sclk_fimd", "fimd";
        };