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 18a7f39..7ef257b 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -489,15 +489,9 @@
 
 &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 062cba4..24e5abc 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -319,13 +319,9 @@
 
 &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 8788880..077be53 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi
+++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
@@ -264,7 +264,6 @@
        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 @@
 
 &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 d53bfcb..ebf0b2d 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-spring.dts
+++ b/arch/arm/boot/dts/exynos5250-spring.dts
@@ -94,7 +94,6 @@
        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 @@
 
 &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 ca0587e..49a614f 100644 (file)
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -435,6 +435,11 @@
                        clocks = <&clock CLK_I2C_HDMI>;
                        clock-names = "i2c";
                        status = "disabled";
+
+                       hdmiphy: hdmiphy@38 {
+                               compatible = "samsung,exynos4212-hdmiphy";
+                               reg = <0x38>;
+                       };
                };
 
                i2c_9: i2c@121D0000 {
@@ -755,6 +760,7 @@
                        clock-names = "hdmi", "sclk_hdmi", "sclk_pixel",
                                        "sclk_hdmiphy", "mout_hdmi";
                        samsung,syscon-phandle = <&pmu_system_controller>;
+                       phy = <&hdmiphy>;
                };
 
                hdmicec: cec@101B0000 {