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

Fix conncector registration with tda998x.

* 'drm-tda998x-mali' of git://git.armlinux.org.uk/~rmk/linux-arm:
  drm/i2c: tda998x: mali-dp: hdlcd: refactor connector registration

diff --cc drivers/gpu/drm/arm/hdlcd_drv.c
Simple merge

diff --cc drivers/gpu/drm/arm/malidp_drv.c
index ebf90c794eabc4e34fb4ac6b4b7ab0343656006b,79bfc1360a1bec758fef09fead6f69e530d5eade..32f746e313790499e031e9709765f35ebc28b27e
--- 1/drivers/gpu/drm/arm/malidp_drv.c
--- 2/drivers/gpu/drm/arm/malidp_drv.c
+++ b/drivers/gpu/drm/arm/malidp_drv.c
@@@ -415,9 -413,8 +421,7 @@@ bind_fail
        of_node_put(malidp->crtc.port);
        malidp->crtc.port = NULL;
  port_fail:
-       drm_dev_unregister(drm);
- register_fail:
 -      malidp_de_planes_destroy(drm);
 -      drm_mode_config_cleanup(drm);
 +      malidp_fini(drm);
  init_fail:
        drm->dev_private = NULL;
        dev_set_drvdata(dev, NULL);
@@@ -449,8 -447,8 +454,7 @@@ static void malidp_unbind(struct devic
        component_unbind_all(dev, drm);
        of_node_put(malidp->crtc.port);
        malidp->crtc.port = NULL;
-       drm_dev_unregister(drm);
 -      malidp_de_planes_destroy(drm);
 -      drm_mode_config_cleanup(drm);
 +      malidp_fini(drm);
        drm->dev_private = NULL;
        dev_set_drvdata(dev, NULL);
        clk_disable_unprepare(hwdev->mclk);

diff --cc drivers/gpu/drm/i2c/tda998x_drv.c
Simple merge