Merge branch 'topic/ipu-destaging' of git://git.pengutronix.de/git/pza/linux into...

Destage IPUv3

* 'topic/ipu-destaging' of git://git.pengutronix.de/git/pza/linux:
  gpu: ipu-v3: Register the CSI modules
  gpu: ipu-v3: Add CSI and SMFC module enable wrappers
  gpu: ipu-v3: Add ipu_idmac_get_current_buffer function
  gpu: ipu-v3: Add SMFC code
  gpu: ipu-v3: Move i.MX IPUv3 core driver out of staging

diff --combined drivers/staging/imx-drm/imx-hdmi.c
index 9fbe6d6a989de7f33e57ddc908e51fe08a23cffd,461f224d26abe94b1a8848aa99b884dc5e62c896..76749231c48aa2611d29cbb87c9799900231d054
--- 1/drivers/staging/imx-drm/imx-hdmi.c
--- 2/drivers/staging/imx-drm/imx-hdmi.c
+++ b/drivers/staging/imx-drm/imx-hdmi.c
@@@ -27,8 -27,8 +27,8 @@@
  #include <drm/drm_crtc_helper.h>
  #include <drm/drm_edid.h>
  #include <drm/drm_encoder_slave.h>
+ #include <video/imx-ipu-v3.h>
  
- #include "ipu-v3/imx-ipu-v3.h"
  #include "imx-hdmi.h"
  #include "imx-drm.h"
  
@@@ -1492,6 -1492,7 +1492,6 @@@ static struct drm_connector_funcs imx_h
  
  static struct drm_connector_helper_funcs imx_hdmi_connector_helper_funcs = {
        .get_modes = imx_hdmi_connector_get_modes,
 -      .mode_valid = imx_drm_connector_mode_valid,
        .best_encoder = imx_hdmi_connector_best_encoder,
  };
  

diff --combined drivers/staging/imx-drm/imx-tve.c
index 4caef2b1653db63a47765f1e2bcb56f53ae1e6b9,5bcb4051665689a8c73a241a9babd81394b65fa9..c628fcdc22aef31d80844e72e5198a27ecd98aa9
--- 1/drivers/staging/imx-drm/imx-tve.c
--- 2/drivers/staging/imx-drm/imx-tve.c
+++ b/drivers/staging/imx-drm/imx-tve.c
@@@ -30,8 -30,8 +30,8 @@@
  #include <drm/drmP.h>
  #include <drm/drm_fb_helper.h>
  #include <drm/drm_crtc_helper.h>
+ #include <video/imx-ipu-v3.h>
  
- #include "ipu-v3/imx-ipu-v3.h"
  #include "imx-drm.h"
  
  #define TVE_COM_CONF_REG      0x00
@@@ -249,6 -249,11 +249,6 @@@ static int imx_tve_connector_mode_valid
  {
        struct imx_tve *tve = con_to_tve(connector);
        unsigned long rate;
 -      int ret;
 -
 -      ret = imx_drm_connector_mode_valid(connector, mode);
 -      if (ret != MODE_OK)
 -              return ret;
  
        /* pixel clock with 2x oversampling */
        rate = clk_round_rate(tve->clk, 2000UL * mode->clock) / 2000;
@@@ -577,7 -582,7 +577,7 @@@ static int imx_tve_bind(struct device *
        tve->dev = dev;
        spin_lock_init(&tve->lock);
  
 -      ddc_node = of_parse_phandle(np, "i2c-ddc-bus", 0);
 +      ddc_node = of_parse_phandle(np, "ddc-i2c-bus", 0);
        if (ddc_node) {
                tve->ddc = of_find_i2c_adapter_by_node(ddc_node);
                of_node_put(ddc_node);