Merge tag 'linux-kselftest-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / exynos5250-spring.dts

diff --git a/arch/arm/boot/dts/exynos5250-spring.dts b/arch/arm/boot/dts/exynos5250-spring.dts
index d53bfcbeb39c42f3789514953f152413418d0d49..47dbc50546c104d8fc9e8e8c15201409b50a0913 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-spring.dts
+++ b/arch/arm/boot/dts/exynos5250-spring.dts
@@ -91,10 +91,10 @@
 };
 
 &hdmi {
+       status = "okay";
        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>;
@@ -362,13 +362,9 @@
 
 &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 {
@@ -412,19 +408,19 @@
 
 &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 {
        status = "okay";
 };
 
+&mixer {
+       status = "okay";
+};
+
 &mmc_0 {
        status = "okay";
        broken-cd;