Merge tag 'for-linus-4.15-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / exynos5250-snow-common.dtsi

diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
index 8788880e459d3e1dde6bfddbe80ae3c631693d89..2e7175d2b1b86736762325687e3dde3b590ca1b5 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi
+++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
@@ -261,10 +261,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 = <&tps65090_fet7>;
        vdd-supply = <&ldo8_reg>;
@@ -281,7 +281,7 @@
        samsung,i2c-sda-delay = <100>;
        samsung,i2c-max-bus-freq = <378000>;
 
-       max77686: max77686@09 {
+       max77686: max77686@9 {
                compatible = "maxim,max77686";
                interrupt-parent = <&gpx3>;
                interrupts = <2 IRQ_TYPE_NONE>;
@@ -450,13 +450,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 {
@@ -514,19 +510,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";
+};
+
 /* eMMC flash */
 &mmc_0 {
        status = "okay";