drm/omap: dpi: remove legacy data_lines

Remove DPI's legacy data_lines code.

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

diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
index 13e32d0..947295f 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
+++ b/drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c
@@ -22,7 +22,6 @@ struct panel_drv_data {
        struct omap_dss_device *in;
 
        int pd_gpio;
-       int data_lines;
 
        struct videomode vm;
 };
@@ -82,8 +81,6 @@ static int tfp410_enable(struct omap_dss_device *dssdev)
                return 0;
 
        in->ops.dpi->set_timings(in, &ddata->vm);
-       if (ddata->data_lines)
-               in->ops.dpi->set_data_lines(in, ddata->data_lines);
 
        r = in->ops.dpi->enable(in);
        if (r)
@@ -226,7 +223,6 @@ static int tfp410_probe(struct platform_device *pdev)
        dssdev->type = OMAP_DISPLAY_TYPE_DPI;
        dssdev->output_type = OMAP_DISPLAY_TYPE_DVI;
        dssdev->owner = THIS_MODULE;
-       dssdev->phy.dpi.data_lines = ddata->data_lines;
        dssdev->port_num = 1;
 
        r = omapdss_register_output(dssdev);

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-dpi.c b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
index ed61854..091f732 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-dpi.c
@@ -25,8 +25,6 @@ struct panel_drv_data {
        struct omap_dss_device dssdev;
        struct omap_dss_device *in;
 
-       int data_lines;
-
        struct videomode vm;
 
        struct backlight_device *backlight;
@@ -76,8 +74,6 @@ static int panel_dpi_enable(struct omap_dss_device *dssdev)
        if (omapdss_device_is_enabled(dssdev))
                return 0;
 
-       if (ddata->data_lines)
-               in->ops.dpi->set_data_lines(in, ddata->data_lines);
        in->ops.dpi->set_timings(in, &ddata->vm);
 
        r = in->ops.dpi->enable(in);
@@ -253,7 +249,6 @@ static int panel_dpi_probe(struct platform_device *pdev)
        dssdev->type = OMAP_DISPLAY_TYPE_DPI;
        dssdev->owner = THIS_MODULE;
        dssdev->panel.vm = ddata->vm;
-       dssdev->phy.dpi.data_lines = ddata->data_lines;
 
        r = omapdss_register_display(dssdev);
        if (r) {

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
index 43d21ed..451e160 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c
@@ -49,8 +49,6 @@ struct panel_drv_data {
 
        struct spi_device *spi;
 
-       int data_lines;
-
        struct videomode vm;
 
        struct gpio_desc *enable_gpio;
@@ -159,8 +157,6 @@ static int lb035q02_enable(struct omap_dss_device *dssdev)
        if (omapdss_device_is_enabled(dssdev))
                return 0;
 
-       if (ddata->data_lines)
-               in->ops.dpi->set_data_lines(in, ddata->data_lines);
        in->ops.dpi->set_timings(in, &ddata->vm);
 
        r = in->ops.dpi->enable(in);
@@ -289,7 +285,6 @@ static int lb035q02_panel_spi_probe(struct spi_device *spi)
        dssdev->type = OMAP_DISPLAY_TYPE_DPI;
        dssdev->owner = THIS_MODULE;
        dssdev->panel.vm = ddata->vm;
-       dssdev->phy.dpi.data_lines = ddata->data_lines;
 
        r = omapdss_register_display(dssdev);
        if (r) {

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c b/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
index 2de27ba..95f6702 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c
@@ -25,8 +25,6 @@ struct panel_drv_data {
 
        struct videomode vm;
 
-       int data_lines;
-
        int res_gpio;
        int qvga_gpio;
 
@@ -153,8 +151,6 @@ static int nec_8048_enable(struct omap_dss_device *dssdev)
        if (omapdss_device_is_enabled(dssdev))
                return 0;
 
-       if (ddata->data_lines)
-               in->ops.dpi->set_data_lines(in, ddata->data_lines);
        in->ops.dpi->set_timings(in, &ddata->vm);
 
        r = in->ops.dpi->enable(in);

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c b/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
index 04fe235..b38c3df 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c
@@ -24,8 +24,6 @@ struct panel_drv_data {
        struct omap_dss_device *in;
        struct regulator *vcc;
 
-       int data_lines;
-
        struct videomode vm;
 
        struct gpio_desc *resb_gpio;    /* low = reset active min 20 us */
@@ -99,8 +97,6 @@ static int sharp_ls_enable(struct omap_dss_device *dssdev)
        if (omapdss_device_is_enabled(dssdev))
                return 0;
 
-       if (ddata->data_lines)
-               in->ops.dpi->set_data_lines(in, ddata->data_lines);
        in->ops.dpi->set_timings(in, &ddata->vm);
 
        if (ddata->vcc) {
@@ -289,7 +285,6 @@ static int sharp_ls_probe(struct platform_device *pdev)
        dssdev->type = OMAP_DISPLAY_TYPE_DPI;
        dssdev->owner = THIS_MODULE;
        dssdev->panel.vm = ddata->vm;
-       dssdev->phy.dpi.data_lines = ddata->data_lines;
 
        r = omapdss_register_display(dssdev);
        if (r) {

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
index f313dbf..cbf4c67 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c
@@ -35,8 +35,6 @@ struct panel_drv_data {
        struct omap_dss_device dssdev;
        struct omap_dss_device *in;
 
-       int data_lines;
-
        struct videomode vm;
 
        struct spi_device *spi_dev;
@@ -207,8 +205,6 @@ static int td028ttec1_panel_enable(struct omap_dss_device *dssdev)
        if (omapdss_device_is_enabled(dssdev))
                return 0;
 
-       if (ddata->data_lines)
-               in->ops.dpi->set_data_lines(in, ddata->data_lines);
        in->ops.dpi->set_timings(in, &ddata->vm);
 
        r = in->ops.dpi->enable(in);
@@ -423,7 +419,6 @@ static int td028ttec1_panel_probe(struct spi_device *spi)
        dssdev->type = OMAP_DISPLAY_TYPE_DPI;
        dssdev->owner = THIS_MODULE;
        dssdev->panel.vm = ddata->vm;
-       dssdev->phy.dpi.data_lines = ddata->data_lines;
 
        r = omapdss_register_display(dssdev);
        if (r) {

diff --git a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
index 0787dba..da5ea2c 100644 (file)
--- a/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
+++ b/drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c
@@ -58,8 +58,6 @@ struct panel_drv_data {
 
        struct videomode vm;
 
-       int data_lines;
-
        struct spi_device *spi;
        struct regulator *vcc_reg;
        int nreset_gpio;
@@ -378,8 +376,6 @@ static int tpo_td043_enable(struct omap_dss_device *dssdev)
        if (omapdss_device_is_enabled(dssdev))
                return 0;
 
-       if (ddata->data_lines)
-               in->ops.dpi->set_data_lines(in, ddata->data_lines);
        in->ops.dpi->set_timings(in, &ddata->vm);
 
        r = in->ops.dpi->enable(in);

diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c b/drivers/gpu/drm/omapdrm/dss/dpi.c
index b387c2f..86dbb65 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -560,17 +560,6 @@ static int dpi_check_timings(struct omap_dss_device *dssdev,
        return 0;
 }
 
-static void dpi_set_data_lines(struct omap_dss_device *dssdev, int data_lines)
-{
-       struct dpi_data *dpi = dpi_get_data_from_dssdev(dssdev);
-
-       mutex_lock(&dpi->lock);
-
-       dpi->data_lines = data_lines;
-
-       mutex_unlock(&dpi->lock);
-}
-
 static int dpi_verify_pll(struct dss_pll *pll)
 {
        int r;
@@ -725,8 +714,6 @@ static const struct omapdss_dpi_ops dpi_ops = {
        .check_timings = dpi_check_timings,
        .set_timings = dpi_set_timings,
        .get_timings = dpi_get_timings,
-
-       .set_data_lines = dpi_set_data_lines,
 };
 
 static void dpi_init_output_port(struct platform_device *pdev,

diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
index 47f0205..3cbc9e4 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
+++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
@@ -471,8 +471,6 @@ struct omapdss_dpi_ops {
                            struct videomode *vm);
        void (*get_timings)(struct omap_dss_device *dssdev,
                            struct videomode *vm);
-
-       void (*set_data_lines)(struct omap_dss_device *dssdev, int data_lines);
 };
 
 struct omapdss_sdi_ops {
@@ -626,10 +624,6 @@ struct omap_dss_device {
 
        union {
                struct {
-                       u8 data_lines;
-               } dpi;
-
-               struct {
                        u8 channel;
                        u8 data_lines;
                } rfbi;