Merge branch 'drm-tda998x-devel' of git://git.armlinux.org.uk/~rmk/linux-arm into...

From: Russell King <rmk@armlinux.org.uk>
As per the patches posted, discussed and tested by Peter Rosin, this
converts TDA998x to a bridge driver, while still allowing Armada and
TI LCDC to continue using it as they always have done.  It also gets
rid of the private .fill_modes function, and tweaks the TMDS divider
calculation to be more correct to the available information.

[airlied: fixed two conflicts]
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180802093421.GA29670@rmk-PC.armlinux.org.uk

diff --cc drivers/gpu/drm/i2c/tda998x_drv.c
index eecdc327b9f880062922351efa8487b82db41c91,0df86e9281913c4f8e91a8b8492981b9ba557165..a7c39f39793ff2c2ce152e3cba3c3036513a7f19
--- 1/drivers/gpu/drm/i2c/tda998x_drv.c
--- 2/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@@ -1243,8 -1222,13 +1222,13 @@@ static int tda998x_connector_get_modes(
                return 0;
        }
  
 -      drm_mode_connector_update_edid_property(connector, edid);
 +      drm_connector_update_edid_property(connector, edid);
+       cec_notifier_set_phys_addr_from_edid(priv->cec_notify, edid);
+ 
+       mutex_lock(&priv->audio_mutex);
        n = drm_add_edid_modes(connector, edid);
+       priv->sink_has_audio = drm_detect_monitor_audio(edid);
+       mutex_unlock(&priv->audio_mutex);
  
        kfree(edid);
  
@@@ -1301,7 -1269,8 +1269,8 @@@ static int tda998x_connector_init(struc
        if (ret)
                return ret;
  
-       drm_connector_attach_encoder(&priv->connector, &priv->encoder);
 -      drm_mode_connector_attach_encoder(&priv->connector,
 -                                        priv->bridge.encoder);
++      drm_connector_attach_encoder(&priv->connector,
++                                   priv->bridge.encoder);
  
        return 0;
  }