From: Dave Airlie <airlied@redhat.com>
Date: Mon, 4 Aug 2014 23:26:09 +0000 (+1000)
Subject: Merge branch 'tda998x-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox into... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=920f946428b70494eb1c64e0de260da0d8bde040;p=deliverable%2Flinux.git

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

This builds upon the previous set of fixes which were pulled on 6th July.
Included in this set are:
- an update from Jean-Francois to add the missing reg documentation entry
  to the device tree documentation.
- conversion of the tda998x driver to the component helpers.

* 'tda998x-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-cubox:
  drm/i2c: tda998x: add component support
  drm/i2c: tda998x: allow re-use of tda998x support code
  drm/i2c: tda998x: fix lack of required reg in DT documentation

Conflicts:
	drivers/gpu/drm/i2c/tda998x_drv.c
---

920f946428b70494eb1c64e0de260da0d8bde040
diff --cc drivers/gpu/drm/i2c/tda998x_drv.c
index a8f1e03bd1f5,3b07ff7e6348..e9ddab93a9d8
--- a/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@@ -1196,7 -1173,23 +1173,22 @@@ static void tda998x_destroy(struct tda9
  	if (priv->hdmi->irq)
  		free_irq(priv->hdmi->irq, priv);
  
 -	if (priv->cec)
 -		i2c_unregister_device(priv->cec);
 +	i2c_unregister_device(priv->cec);
+ }
+ 
+ /* Slave encoder support */
+ 
+ static void
+ tda998x_encoder_slave_set_config(struct drm_encoder *encoder, void *params)
+ {
+ 	tda998x_encoder_set_config(to_tda998x_priv(encoder), params);
+ }
+ 
+ static void tda998x_encoder_slave_destroy(struct drm_encoder *encoder)
+ {
+ 	struct tda998x_priv *priv = to_tda998x_priv(encoder);
+ 
+ 	tda998x_destroy(priv);
  	drm_i2c_encoder_destroy(encoder);
  	kfree(priv);
  }