Merge tag 'dw-hdmi-next-2016-09-19' of git://git.pengutronix.de/git/pza/linux into...

dw-hdmi i2c master controller

- add support for the HDMI I2C master controller, for boards that
  can have their DDC pins connected only to the HDMI TX directly.

* tag 'dw-hdmi-next-2016-09-19' of git://git.pengutronix.de/git/pza/linux:
  drm: bridge/dw_hdmi: add dw hdmi i2c bus adapter support
  drm: dw_hdmi: use of_get_i2c_adapter_by_node interface

diff --cc drivers/gpu/drm/bridge/dw-hdmi.c
index ab7023e5dfdec6d5981f48a46f35aca67df8ac7b,cdf0a3a2e6f8c3da980983b5ec9f967c53b13209..b71088dab2685b56e30179f0c13410f22138ea1f
--- 1/drivers/gpu/drm/bridge/dw-hdmi.c
--- 2/drivers/gpu/drm/bridge/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/dw-hdmi.c
@@@ -1807,9 -2064,16 +2059,13 @@@ void dw_hdmi_unbind(struct device *dev
        /* Disable all interrupts */
        hdmi_writeb(hdmi, ~0, HDMI_IH_MUTE_PHY_STAT0);
  
 -      hdmi->connector.funcs->destroy(&hdmi->connector);
 -      hdmi->encoder->funcs->destroy(hdmi->encoder);
 -
        clk_disable_unprepare(hdmi->iahb_clk);
        clk_disable_unprepare(hdmi->isfr_clk);
-       i2c_put_adapter(hdmi->ddc);
+ 
+       if (hdmi->i2c)
+               i2c_del_adapter(&hdmi->i2c->adap);
+       else
+               i2c_put_adapter(hdmi->ddc);
  }
  EXPORT_SYMBOL_GPL(dw_hdmi_unbind);