imx-drm: convert to componentised device support

[deliverable/linux.git] / drivers / staging / imx-drm / ipuv3-crtc.c

diff --git a/drivers/staging/imx-drm/ipuv3-crtc.c b/drivers/staging/imx-drm/ipuv3-crtc.c
index 22be104fbda97526980481011ad5250121b52948..d779ad2d1f4ea4b4764560a7c7305bec246a2e12 100644 (file)
--- a/drivers/staging/imx-drm/ipuv3-crtc.c
+++ b/drivers/staging/imx-drm/ipuv3-crtc.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301, USA.
  */
+#include <linux/component.h>
 #include <linux/module.h>
 #include <linux/export.h>
 #include <linux/device.h>
@@ -284,6 +285,7 @@ static int ipu_set_interface_pix_fmt(struct drm_crtc *crtc, u32 encoder_type,
                ipu_crtc->di_clkflags = IPU_DI_CLKMODE_SYNC |
                        IPU_DI_CLKMODE_EXT;
                break;
+       case DRM_MODE_ENCODER_TMDS:
        case DRM_MODE_ENCODER_NONE:
                ipu_crtc->di_clkflags = 0;
                break;
@@ -399,43 +401,60 @@ err_put_resources:
        return ret;
 }
 
-static int ipu_drm_probe(struct platform_device *pdev)
+static int ipu_drm_bind(struct device *dev, struct device *master, void *data)
 {
-       struct ipu_client_platformdata *pdata = pdev->dev.platform_data;
+       struct ipu_client_platformdata *pdata = dev->platform_data;
        struct ipu_crtc *ipu_crtc;
        int ret;
 
-       if (!pdata)
-               return -EINVAL;
-
-       ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
-       if (ret)
-               return ret;
-
-       ipu_crtc = devm_kzalloc(&pdev->dev, sizeof(*ipu_crtc), GFP_KERNEL);
+       ipu_crtc = devm_kzalloc(dev, sizeof(*ipu_crtc), GFP_KERNEL);
        if (!ipu_crtc)
                return -ENOMEM;
 
-       ipu_crtc->dev = &pdev->dev;
+       ipu_crtc->dev = dev;
 
        ret = ipu_crtc_init(ipu_crtc, pdata);
        if (ret)
                return ret;
 
-       platform_set_drvdata(pdev, ipu_crtc);
+       dev_set_drvdata(dev, ipu_crtc);
 
        return 0;
 }
 
-static int ipu_drm_remove(struct platform_device *pdev)
+static void ipu_drm_unbind(struct device *dev, struct device *master,
+       void *data)
 {
-       struct ipu_crtc *ipu_crtc = platform_get_drvdata(pdev);
+       struct ipu_crtc *ipu_crtc = dev_get_drvdata(dev);
 
        imx_drm_remove_crtc(ipu_crtc->imx_crtc);
 
        ipu_plane_put_resources(ipu_crtc->plane[0]);
        ipu_put_resources(ipu_crtc);
+}
+
+static const struct component_ops ipu_crtc_ops = {
+       .bind = ipu_drm_bind,
+       .unbind = ipu_drm_unbind,
+};
 
+static int ipu_drm_probe(struct platform_device *pdev)
+{
+       int ret;
+
+       if (!pdev->dev.platform_data)
+               return -EINVAL;
+
+       ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+       if (ret)
+               return ret;
+
+       return component_add(&pdev->dev, &ipu_crtc_ops);
+}
+
+static int ipu_drm_remove(struct platform_device *pdev)
+{
+       component_del(&pdev->dev, &ipu_crtc_ops);
        return 0;
 }