drm: omapdrm: sdi: Remove platform driver

The SDI platform driver was used for non-DT platforms only. On DT
platforms the SDI port is handled manually. As OMAP display devices are
now instantiated from DT only, remove the SDI platform driver.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/gpu/drm/omapdrm/dss/core.c b/drivers/gpu/drm/omapdrm/dss/core.c
index 35def6fd6acda0b0f31d6bf1dc48fab37c3d5900..f056bffcab732489aceba1634e28641b04a803c8 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/core.c
+++ b/drivers/gpu/drm/omapdrm/dss/core.c
@@ -208,9 +208,6 @@ static int (*dss_output_drv_reg_funcs[])(void) __initdata = {
 #ifdef CONFIG_OMAP2_DSS_DSI
        dsi_init_platform_driver,
 #endif
-#ifdef CONFIG_OMAP2_DSS_SDI
-       sdi_init_platform_driver,
-#endif
 #ifdef CONFIG_OMAP2_DSS_RFBI
        rfbi_init_platform_driver,
 #endif
@@ -238,9 +235,6 @@ static void (*dss_output_drv_unreg_funcs[])(void) = {
 #ifdef CONFIG_OMAP2_DSS_RFBI
        rfbi_uninit_platform_driver,
 #endif
-#ifdef CONFIG_OMAP2_DSS_SDI
-       sdi_uninit_platform_driver,
-#endif
 #ifdef CONFIG_OMAP2_DSS_DSI
        dsi_uninit_platform_driver,
 #endif

diff --git a/drivers/gpu/drm/omapdrm/dss/dss.h b/drivers/gpu/drm/omapdrm/dss/dss.h
index 197ff48dce4613328154e48e57eb734999eee7da..d8bf99a975719aced7943345e4ff6041e765f2f6 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dss.h
+++ b/drivers/gpu/drm/omapdrm/dss/dss.h
@@ -280,9 +280,6 @@ bool dss_div_calc(unsigned long pck, unsigned long fck_min,
                dss_div_calc_func func, void *data);
 
 /* SDI */
-int sdi_init_platform_driver(void) __init;
-void sdi_uninit_platform_driver(void);
-
 #ifdef CONFIG_OMAP2_DSS_SDI
 int sdi_init_port(struct platform_device *pdev, struct device_node *port);
 void sdi_uninit_port(struct device_node *port);

diff --git a/drivers/gpu/drm/omapdrm/dss/sdi.c b/drivers/gpu/drm/omapdrm/dss/sdi.c
index 0620b9f8c231a44f983f01eaa7f22b2133725458..f2f8aed53a7b5cf195a7c690b2098b1a5cfc89c0 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/sdi.c
+++ b/drivers/gpu/drm/omapdrm/dss/sdi.c
@@ -27,7 +27,6 @@
 #include <linux/platform_device.h>
 #include <linux/string.h>
 #include <linux/of.h>
-#include <linux/component.h>
 
 #include "omapdss.h"
 #include "dss.h"
@@ -355,59 +354,6 @@ static void sdi_uninit_output(struct platform_device *pdev)
        omapdss_unregister_output(out);
 }
 
-static int sdi_bind(struct device *dev, struct device *master, void *data)
-{
-       struct platform_device *pdev = to_platform_device(dev);
-
-       sdi.pdev = pdev;
-
-       sdi_init_output(pdev);
-
-       return 0;
-}
-
-static void sdi_unbind(struct device *dev, struct device *master, void *data)
-{
-       struct platform_device *pdev = to_platform_device(dev);
-
-       sdi_uninit_output(pdev);
-}
-
-static const struct component_ops sdi_component_ops = {
-       .bind   = sdi_bind,
-       .unbind = sdi_unbind,
-};
-
-static int sdi_probe(struct platform_device *pdev)
-{
-       return component_add(&pdev->dev, &sdi_component_ops);
-}
-
-static int sdi_remove(struct platform_device *pdev)
-{
-       component_del(&pdev->dev, &sdi_component_ops);
-       return 0;
-}
-
-static struct platform_driver omap_sdi_driver = {
-       .probe          = sdi_probe,
-       .remove         = sdi_remove,
-       .driver         = {
-               .name   = "omapdss_sdi",
-               .suppress_bind_attrs = true,
-       },
-};
-
-int __init sdi_init_platform_driver(void)
-{
-       return platform_driver_register(&omap_sdi_driver);
-}
-
-void sdi_uninit_platform_driver(void)
-{
-       platform_driver_unregister(&omap_sdi_driver);
-}
-
 int sdi_init_port(struct platform_device *pdev, struct device_node *port)
 {
        struct device_node *ep;