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 185aba8..6afa57d 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 76825ef..ca43020 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 d176dbb..2538b32 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 c6bc2ba..f46b06a 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 {