ARM: dts: exynos: Move HDMI PHY node from boards to exynos5250.dtsi

All Exynos 5250 SoCs have HDMI PHY connected via dedicated I2C bus (bus
number 8), so HDMI PHY should be defined in exynos5250.dtsi instead of
duplicating it in every board, which enables HDMI support.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index 18a7f396ac5f727b4daa0c15b2723b3ca89035d2..7ef257b75562b10a06646d70be5d75cd5aa0f73f 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -489,15 +489,9 @@ wm1811a@1a {
 
 &i2c_8 {
        status = "okay";
-
+       /* used by HDMI PHY */
        samsung,i2c-sda-delay = <100>;
        samsung,i2c-max-bus-freq = <66000>;
-       samsung,i2c-slave-addr = <0x38>;
-
-       hdmiphy@38 {
-               compatible = "samsung,exynos4212-hdmiphy";
-               reg = <0x38>;
-       };
 };
 
 &i2c_9 {

diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 062cba4c2c310b28846634d354b10fe4d07e786c..24e5abc9fb9da055d427203b61483dbdf1948ad2 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -319,13 +319,9 @@ hdmiddc@50 {
 
 &i2c_8 {
        status = "okay";
+       /* used by HDMI PHY */
        samsung,i2c-sda-delay = <100>;
        samsung,i2c-max-bus-freq = <66000>;
-
-       hdmiphy@38 {
-               compatible = "samsung,exynos4212-hdmiphy";
-               reg = <0x38>;
-       };
 };
 
 &i2c_9 {

diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
index 8788880e459d3e1dde6bfddbe80ae3c631693d89..077be5355bf97e9e3b98616cbaf8b5c84344d950 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi
+++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
@@ -264,7 +264,6 @@ &hdmi {
        hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
        pinctrl-names = "default";
        pinctrl-0 = <&hdmi_hpd_irq>;
-       phy = <&hdmiphy>;
        ddc = <&i2c_2>;
        hdmi-en-supply = <&tps65090_fet7>;
        vdd-supply = <&ldo8_reg>;
@@ -514,13 +513,9 @@ bridge_in: endpoint {
 
 &i2c_8 {
        status = "okay";
+       /* used by HDMI PHY */
        samsung,i2c-sda-delay = <100>;
        samsung,i2c-max-bus-freq = <378000>;
-
-       hdmiphy: hdmiphy@38 {
-               compatible = "samsung,exynos4212-hdmiphy";
-               reg = <0x38>;
-       };
 };
 
 &i2s0 {

diff --git a/arch/arm/boot/dts/exynos5250-spring.dts b/arch/arm/boot/dts/exynos5250-spring.dts
index d53bfcbeb39c42f3789514953f152413418d0d49..ebf0b2d5b363426afba400ab0e63702d4a9c0dad 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-spring.dts
+++ b/arch/arm/boot/dts/exynos5250-spring.dts
@@ -94,7 +94,6 @@ &hdmi {
        hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
        pinctrl-names = "default";
        pinctrl-0 = <&hdmi_hpd_irq>;
-       phy = <&hdmiphy>;
        ddc = <&i2c_2>;
        hdmi-en-supply = <&ldo8_reg>;
        vdd-supply = <&ldo8_reg>;
@@ -412,13 +411,9 @@ temperature-sensor@4c {
 
 &i2c_8 {
        status = "okay";
+       /* used by HDMI PHY */
        samsung,i2c-sda-delay = <100>;
        samsung,i2c-max-bus-freq = <378000>;
-
-       hdmiphy: hdmiphy@38 {
-               compatible = "samsung,exynos4212-hdmiphy";
-               reg = <0x38>;
-       };
 };
 
 &i2s0 {

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index d0d0460031a56e95b2958ac3c353c5fef6808187..7048609f37319446d2048d8dde61eac92c5c54e4 100644 (file)
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -367,6 +367,11 @@ i2c_8: i2c@12CE0000 {
                        clocks = <&clock CLK_I2C_HDMI>;
                        clock-names = "i2c";
                        status = "disabled";
+
+                       hdmiphy: hdmiphy@38 {
+                               compatible = "samsung,exynos4212-hdmiphy";
+                               reg = <0x38>;
+                       };
                };
 
                i2c_9: i2c@121D0000 {
@@ -687,6 +692,7 @@ hdmi: hdmi@14530000 {
                        clock-names = "hdmi", "sclk_hdmi", "sclk_pixel",
                                        "sclk_hdmiphy", "mout_hdmi";
                        samsung,syscon-phandle = <&pmu_system_controller>;
+                       phy = <&hdmiphy>;
                };
 
                hdmicec: cec@101B0000 {