drm/omap: acx565akm: remove non-DT support
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Fri, 12 May 2017 09:36:32 +0000 (12:36 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Fri, 2 Jun 2017 07:57:15 +0000 (10:57 +0300)
Non-DT booting is no longer supported, so remove legacy code.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c

index 5ab39e0..9037e1d 100644 (file)
@@ -32,8 +32,6 @@
 #include <linux/of.h>
 #include <linux/of_gpio.h>
 
-#include <video/omap-panel-data.h>
-
 #include "../dss/omapdss.h"
 
 #define MIPID_CMD_READ_DISP_ID         0x04
@@ -69,7 +67,6 @@ struct panel_drv_data {
        struct omap_dss_device *in;
 
        int reset_gpio;
-       int datapairs;
 
        struct videomode vm;
 
@@ -547,9 +544,6 @@ static int acx565akm_panel_power_on(struct omap_dss_device *dssdev)
 
        in->ops.sdi->set_timings(in, &ddata->vm);
 
-       if (ddata->datapairs > 0)
-               in->ops.sdi->set_datapairs(in, ddata->datapairs);
-
        r = in->ops.sdi->enable(in);
        if (r) {
                pr_err("%s sdi enable failed\n", __func__);
@@ -701,32 +695,6 @@ static struct omap_dss_driver acx565akm_ops = {
        .get_resolution = omapdss_default_get_resolution,
 };
 
-static int acx565akm_probe_pdata(struct spi_device *spi)
-{
-       const struct panel_acx565akm_platform_data *pdata;
-       struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev);
-       struct omap_dss_device *dssdev, *in;
-
-       pdata = dev_get_platdata(&spi->dev);
-
-       ddata->reset_gpio = pdata->reset_gpio;
-
-       in = omap_dss_find_output(pdata->source);
-       if (in == NULL) {
-               dev_err(&spi->dev, "failed to find video source '%s'\n",
-                               pdata->source);
-               return -EPROBE_DEFER;
-       }
-       ddata->in = in;
-
-       ddata->datapairs = pdata->datapairs;
-
-       dssdev = &ddata->dssdev;
-       dssdev->name = pdata->name;
-
-       return 0;
-}
-
 static int acx565akm_probe_of(struct spi_device *spi)
 {
        struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev);
@@ -766,18 +734,9 @@ static int acx565akm_probe(struct spi_device *spi)
 
        mutex_init(&ddata->mutex);
 
-       if (dev_get_platdata(&spi->dev)) {
-               r = acx565akm_probe_pdata(spi);
-               if (r)
-                       return r;
-       } else if (spi->dev.of_node) {
-               r = acx565akm_probe_of(spi);
-               if (r)
-                       return r;
-       } else {
-               dev_err(&spi->dev, "platform data missing!\n");
-               return -ENODEV;
-       }
+       r = acx565akm_probe_of(spi);
+       if (r)
+               return r;
 
        if (gpio_is_valid(ddata->reset_gpio)) {
                r = devm_gpio_request_one(&spi->dev, ddata->reset_gpio,