ARM: dts: exynos: Cleanup HDMI DCC definitions on Exynos5250 and Exynos542x boards

Commit 2b7681326dc2 ("drm/exynos: hdmi: remove the i2c drivers and use")
merged to v3.15 kernel added a required 'ddc' property to Exynos HDMI
device tree bindings, which should point to i2c bus used for handling DDC
(mainly reading display's EDID information). It has been enough time to
convert all boards to use new bindings, but sadly due to copy/paste design
the old approach using separate node with 'samsung,exynos4210-hdmiddc'
compatible was used also for many new boards. This patch finally converts
all boards to the new approach and unifies HDMI DDC definition across all
Exynos boards.

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 7ef257b75562b10a06646d70be5d75cd5aa0f73f..a380cff466aef7726afb03358e77b52ef28fc37b 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -152,6 +152,7 @@ &fimd {
 };
 
 &hdmi {
+       ddc = <&i2c_2>;
        hpd-gpios = <&gpx3 7 GPIO_ACTIVE_LOW>;
        vdd_osc-supply = <&ldo10_reg>;
        vdd_pll-supply = <&ldo8_reg>;
@@ -455,15 +456,9 @@ buck9_reg: BUCK9 {
 
 &i2c_2 {
        status = "okay";
-
+       /* used by HDMI DDC */
        samsung,i2c-sda-delay = <100>;
        samsung,i2c-max-bus-freq = <66000>;
-       samsung,i2c-slave-addr = <0x50>;
-
-       hdmiddc@50 {
-               compatible = "samsung,exynos4210-hdmiddc";
-               reg = <0x50>;
-       };
 };
 
 &i2c_3 {

diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 24e5abc9fb9da055d427203b61483dbdf1948ad2..1330ded91445f2e93b4012ccde5117684b04834a 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -116,6 +116,7 @@ &fimd {
 };
 
 &hdmi {
+       ddc = <&i2c_2>;
        hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
 };
 
@@ -308,13 +309,9 @@ wm8994: wm8994@1a {
 
 &i2c_2 {
        status = "okay";
+       /* used by HDMI DDC */
        samsung,i2c-sda-delay = <100>;
        samsung,i2c-max-bus-freq = <66000>;
-
-       hdmiddc@50 {
-               compatible = "samsung,exynos4210-hdmiddc";
-               reg = <0x50>;
-       };
 };
 
 &i2c_8 {

diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
index 077be5355bf97e9e3b98616cbaf8b5c84344d950..88a8656ca7b3e84dbf28722ca6807a01034e32cc 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi
+++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
@@ -449,13 +449,9 @@ &i2c2_bus {
 
 &i2c_2 {
        status = "okay";
+       /* used by HDMI DDC */
        samsung,i2c-sda-delay = <100>;
        samsung,i2c-max-bus-freq = <66000>;
-
-       hdmiddc@50 {
-               compatible = "samsung,exynos4210-hdmiddc";
-               reg = <0x50>;
-       };
 };
 
 &i2c_3 {

diff --git a/arch/arm/boot/dts/exynos5250-spring.dts b/arch/arm/boot/dts/exynos5250-spring.dts
index ebf0b2d5b363426afba400ab0e63702d4a9c0dad..b3cc22568033693b2db3e8abde35b8098c6d0cce 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-spring.dts
+++ b/arch/arm/boot/dts/exynos5250-spring.dts
@@ -361,13 +361,9 @@ &i2c2_bus {
 
 &i2c_2 {
        status = "okay";
+       /* used by HDMI DDC */
        samsung,i2c-sda-delay = <100>;
        samsung,i2c-max-bus-freq = <66000>;
-
-       hdmiddc@50 {
-               compatible = "samsung,exynos4210-hdmiddc";
-               reg = <0x50>;
-       };
 };
 
 &i2c_3 {

diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts
index 08c8ab173e871fdbea71bbea7207998dbe780daa..cc44dc60d81e6b38d06072cfa00c9d25f15b29a3 100644 (file)
--- a/arch/arm/boot/dts/exynos5420-smdk5420.dts
+++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts
@@ -130,6 +130,7 @@ &fimd {
 
 &hdmi {
        status = "okay";
+       ddc = <&i2c_2>;
        hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
        pinctrl-names = "default";
        pinctrl-0 = <&hdmi_hpd_irq>;
@@ -347,12 +348,8 @@ buck10_reg: BUCK10 {
 &i2c_2 {
        samsung,i2c-sda-delay = <100>;
        samsung,i2c-max-bus-freq = <66000>;
+       /* used by HDMI DDC */
        status = "okay";
-
-       hdmiddc@50 {
-               compatible = "samsung,exynos4210-hdmiddc";
-               reg = <0x50>;
-       };
 };
 
 &mmc_0 {

diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
index 7d2b95c6970ff2a1221056febc1920a1a277fa9c..9b65d39c6b0e44f8d6396c15e6fa6b80f260fc1e 100644 (file)
--- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
@@ -476,6 +476,7 @@ &cpu4 {
 
 &hdmi {
        status = "okay";
+       ddc = <&i2c_2>;
        hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
        pinctrl-names = "default";
        pinctrl-0 = <&hdmi_hpd_irq>;
@@ -724,12 +725,8 @@ buck10_reg: BUCK10 {
 &i2c_2 {
        samsung,i2c-sda-delay = <100>;
        samsung,i2c-max-bus-freq = <66000>;
+       /* used by HDMI DDC */
        status = "okay";
-
-       hdmiddc@50 {
-               compatible = "samsung,exynos4210-hdmiddc";
-               reg = <0x50>;
-       };
 };
 
 &mmc_0 {