From: Dave Airlie <airlied@redhat.com>
Date: Thu, 10 Nov 2016 23:57:54 +0000 (+1000)
Subject: Merge tag 'dw-hdmi-next-2016-09-19' of git://git.pengutronix.de/git/pza/linux into... 
X-Git-Tag: v5.15~12311^2~34
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=90233ee5d189af0b26430d31a041a2dcaa5c868e;p=platform%2Fkernel%2Flinux-starfive.git

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

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
---

90233ee5d189af0b26430d31a041a2dcaa5c868e
diff --cc drivers/gpu/drm/bridge/dw-hdmi.c
index ab7023e,cdf0a3a..b71088d
--- a/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);