David,
Please incorporate support for TDA998x I2C driver CEC, which can be
found at:
git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-devel
with SHA1 ba52762fb1430b2a2ea8127c1a292c15f13b8dac, based on v4.16.
This set of changes brings support for HDMI CEC to the TDA998x driver.
There is a conflict, the resolution for which is trivial, and is
included below.
This will update the following files:
.../devicetree/bindings/display/bridge/tda998x.txt | 3 +
drivers/gpu/drm/i2c/Kconfig | 6 +
drivers/gpu/drm/i2c/Makefile | 1 +
drivers/gpu/drm/i2c/tda9950.c | 509 +++++++++++++++++++++
drivers/gpu/drm/i2c/tda998x_drv.c | 242 ++++++++--
include/linux/platform_data/tda9950.h | 16 +
6 files changed, 750 insertions(+), 27 deletions(-)
create mode 100644 drivers/gpu/drm/i2c/tda9950.c
create mode 100644 include/linux/platform_data/tda9950.h
through these changes:
Russell King (7):
drm/i2c: tda998x: move mutex/waitqueue/timer/work init early
drm/i2c: tda998x: fix error cleanup paths
drm/i2c: tda998x: move CEC device initialisation later
drm/i2c: tda998x: always disable and clear interrupts at probe
drm/i2c: tda9950: add CEC driver
drm/i2c: tda998x: add CEC support
dt-bindings: tda998x: add the calibration gpio
Many thanks.
diff --cc drivers/gpu/drm/i2c/tda998x_drv.c
index eb9916bd84a4,9e67a7b4e3a4..000000000000
--- a/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@@ -1783,14 -1600,8 +1783,13 @@@ fail
/* if encoder_init fails, the encoder slave is never registered,
* so cleanup here:
*/
- if (priv->cec)
- i2c_unregister_device(priv->cec);
+ i2c_unregister_device(priv->cec);
- return -ENXIO;
+ if (priv->cec_notify)
+ cec_notifier_put(priv->cec_notify);
+ if (client->irq)
+ free_irq(client->irq, priv);
+err_irq:
+ return ret;
}
static void tda998x_encoder_prepare(struct drm_encoder *encoder)
With that resolution, the diffstat becomes:
.../devicetree/bindings/display/bridge/tda998x.txt | 3 +
drivers/gpu/drm/i2c/Kconfig | 6 +
drivers/gpu/drm/i2c/Makefile | 1 +
drivers/gpu/drm/i2c/tda9950.c | 509 +++++++++++++++++++++
drivers/gpu/drm/i2c/tda998x_drv.c | 242 ++++++++--
include/linux/platform_data/tda9950.h | 16 +
6 files changed, 750 insertions(+), 27 deletions(-)
create mode 100644 drivers/gpu/drm/i2c/tda9950.c
create mode 100644 include/linux/platform_data/tda9950.h
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
