ARM: dts: Update DP controller DT Node for Exynos5 based SoCs

Moves the properties of DP controller to exynos5.dtsi which are common
across exynos5 SoCs like Exynos5250 and Exynos5420.

The PHY DP Node is based on Jingoo Han's <jg1.han@samsung.com> patch
at https://patchwork.linuxtv.org/patch/19189/

Signed-off-by: Vikas Sajjan <vikas.sajjan@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi
index 185aba820d5ed09e9494f6fc45adfe8dc6f95659..6afa57d2feccb15a35a0155e5d5a47dcb6e336f3 100644 (file)
--- a/arch/arm/boot/dts/exynos5.dtsi
+++ b/arch/arm/boot/dts/exynos5.dtsi
@@ -117,4 +117,14 @@
                interrupts = <18 4>, <18 5>, <18 6>;
                status = "disabled";
        };
+
+       dp-controller@145B0000 {
+               compatible = "samsung,exynos5-dp";
+               reg = <0x145B0000 0x1000>;
+               interrupts = <10 3>;
+               interrupt-parent = <&combiner>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+               status = "disabled";
+       };
 };

diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index 76825efac7025e9593167dfbe867c4d55e6c9521..ca430206c3e81bb4e11b5d166912942dcd3a7c2a 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -509,13 +509,14 @@
                };
        };
 
-       dp-controller {
+       dp-controller@145B0000 {
                samsung,color-space = <0>;
                samsung,dynamic-range = <0>;
                samsung,ycbcr-coeff = <0>;
                samsung,color-depth = <1>;
                samsung,link-rate = <0x0a>;
                samsung,lane-count = <4>;
+               status = "okay";
        };
 
        fimd: fimd@14400000 {

diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index d176dbb78196520c800e5bb059ceed2ddea394fb..2538b329f2cea5367f1517c37673cc77d3e13d3d 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -250,7 +250,7 @@
                samsung,vbus-gpio = <&gpx2 6 0>;
        };
 
-       dp-controller {
+       dp-controller@145B0000 {
                samsung,color-space = <0>;
                samsung,dynamic-range = <0>;
                samsung,ycbcr-coeff = <0>;
@@ -260,6 +260,7 @@
 
                pinctrl-names = "default";
                pinctrl-0 = <&dp_hpd>;
+               status = "okay";
        };
 
        fimd@14400000 {

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index c6bc2bad13783619ba6210c44b62929d3a55c604..f46b06a8fdded8fbe3e4fe65d9f3d5839d1fde1d 100644 (file)
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -622,20 +622,17 @@
                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@14400000 {