OMAPDSS: Remove omap_panel_config enum from omap_dss_device

omap_panel_config contains fields which are finally written to DISPC_POL_FREQo
registers. These are now held by omap_video_timings and are set when the manager
timings are applied.

Remove the omap_panel_config enum, and remove all it's references from panel or
interface drivers.

Signed-off-by: Archit Taneja <archit@ti.com>

diff --git a/drivers/video/omap2/displays/panel-acx565akm.c b/drivers/video/omap2/displays/panel-acx565akm.c
index acfaa40b932ed3bafc307883cb64c6f64b56d600..eaeed4340e04eaf49afd176ec3f95ed2b56d8734 100644 (file)
--- a/drivers/video/omap2/displays/panel-acx565akm.c
+++ b/drivers/video/omap2/displays/panel-acx565akm.c
@@ -505,7 +505,6 @@ static int acx_panel_probe(struct omap_dss_device *dssdev)
        struct backlight_properties props;
 
        dev_dbg(&dssdev->dev, "%s\n", __func__);
-       dssdev->panel.config = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS;
 
        /* FIXME AC bias ? */
        dssdev->panel.timings = acx_panel_timings;

diff --git a/drivers/video/omap2/displays/panel-generic-dpi.c b/drivers/video/omap2/displays/panel-generic-dpi.c
index 6cdd97c64330a987aba30f7588b24fa16d2c3ac3..bc5af2500eb923952a9c7a80aaedfb430ee50974 100644 (file)
--- a/drivers/video/omap2/displays/panel-generic-dpi.c
+++ b/drivers/video/omap2/displays/panel-generic-dpi.c
@@ -40,8 +40,6 @@
 struct panel_config {
        struct omap_video_timings timings;
 
-       enum omap_panel_config config;
-
        int power_on_delay;
        int power_off_delay;
 
@@ -76,8 +74,6 @@ static struct panel_config generic_dpi_panels[] = {
                        .de_level       = OMAPDSS_SIG_ACTIVE_LOW,
                        .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES,
                },
-               .config                 = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS |
-                                               OMAP_DSS_LCD_IEO,
                .power_on_delay         = 50,
                .power_off_delay        = 100,
                .name                   = "sharp_lq",
@@ -105,7 +101,6 @@ static struct panel_config generic_dpi_panels[] = {
                        .de_level       = OMAPDSS_SIG_ACTIVE_HIGH,
                        .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES,
                },
-               .config                 = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS,
                .power_on_delay         = 50,
                .power_off_delay        = 100,
                .name                   = "sharp_ls",
@@ -133,9 +128,6 @@ static struct panel_config generic_dpi_panels[] = {
                        .de_level       = OMAPDSS_SIG_ACTIVE_HIGH,
                        .sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE,
                },
-               .config                 = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS |
-                                               OMAP_DSS_LCD_IPC |
-                                               OMAP_DSS_LCD_ONOFF,
                .power_on_delay         = 0,
                .power_off_delay        = 0,
                .name                   = "toppoly_tdo35s",
@@ -163,7 +155,6 @@ static struct panel_config generic_dpi_panels[] = {
                        .de_level       = OMAPDSS_SIG_ACTIVE_HIGH,
                        .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES,
                },
-               .config                 = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS,
                .power_on_delay         = 0,
                .power_off_delay        = 0,
                .name                   = "samsung_lte430wq_f0c",
@@ -191,7 +182,6 @@ static struct panel_config generic_dpi_panels[] = {
                        .de_level       = OMAPDSS_SIG_ACTIVE_HIGH,
                        .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES,
                },
-               .config                 = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS,
                .power_on_delay         = 0,
                .power_off_delay        = 0,
                .name                   = "seiko_70wvw1tz3",
@@ -219,8 +209,6 @@ static struct panel_config generic_dpi_panels[] = {
                        .de_level       = OMAPDSS_SIG_ACTIVE_LOW,
                        .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES,
                },
-               .config                 = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS |
-                                               OMAP_DSS_LCD_IEO,
                .power_on_delay         = 0,
                .power_off_delay        = 0,
                .name                   = "powertip_ph480272t",
@@ -248,7 +236,6 @@ static struct panel_config generic_dpi_panels[] = {
                        .de_level       = OMAPDSS_SIG_ACTIVE_HIGH,
                        .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES,
                },
-               .config                 = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS,
                .power_on_delay         = 0,
                .power_off_delay        = 0,
                .name                   = "innolux_at070tn83",
@@ -276,7 +263,6 @@ static struct panel_config generic_dpi_panels[] = {
                        .de_level       = OMAPDSS_SIG_ACTIVE_HIGH,
                        .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES,
                },
-               .config                 = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS,
                .name                   = "nec_nl2432dr22-11b",
        },
 
@@ -327,8 +313,6 @@ static struct panel_config generic_dpi_panels[] = {
                        .de_level       = OMAPDSS_SIG_ACTIVE_HIGH,
                        .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES,
                },
-               .config                 = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS,
-
                .name                   = "apollon",
        },
        /* FocalTech ETM070003DH6 */
@@ -353,7 +337,6 @@ static struct panel_config generic_dpi_panels[] = {
                        .de_level       = OMAPDSS_SIG_ACTIVE_HIGH,
                        .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES,
                },
-               .config                 = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS,
                .name                   = "focaltech_etm070003dh6",
        },
 
@@ -379,8 +362,6 @@ static struct panel_config generic_dpi_panels[] = {
                        .de_level       = OMAPDSS_SIG_ACTIVE_HIGH,
                        .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES,
                },
-               .config                 = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS |
-                                               OMAP_DSS_LCD_IPC,
                .power_on_delay         = 0,
                .power_off_delay        = 0,
                .name                   = "microtips_umsh_8173md",
@@ -433,9 +414,6 @@ static struct panel_config generic_dpi_panels[] = {
                        .de_level       = OMAPDSS_SIG_ACTIVE_LOW,
                        .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES,
                },
-               .config                 = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS |
-                                               OMAP_DSS_LCD_IEO,
-
                .name                   = "innolux_at080tn52",
        },
 
@@ -508,8 +486,6 @@ static struct panel_config generic_dpi_panels[] = {
                        .de_level       = OMAPDSS_SIG_ACTIVE_HIGH,
                        .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES,
                },
-               .config                 = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS |
-                                               OMAP_DSS_LCD_IPC,
                .name                   = "primeview_pd050vl1",
        },
 
@@ -535,8 +511,6 @@ static struct panel_config generic_dpi_panels[] = {
                        .de_level       = OMAPDSS_SIG_ACTIVE_HIGH,
                        .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES,
                },
-               .config                 = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS |
-                                               OMAP_DSS_LCD_IPC,
                .name                   = "primeview_pm070wl4",
        },
 
@@ -562,8 +536,6 @@ static struct panel_config generic_dpi_panels[] = {
                        .de_level       = OMAPDSS_SIG_ACTIVE_HIGH,
                        .sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES,
                },
-               .config                 = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS |
-                                               OMAP_DSS_LCD_IPC,
                .name                   = "primeview_pd104slf",
        },
 };
@@ -653,7 +625,6 @@ static int generic_dpi_panel_probe(struct omap_dss_device *dssdev)
        if (!panel_config)
                return -EINVAL;
 
-       dssdev->panel.config = panel_config->config;
        dssdev->panel.timings = panel_config->timings;
 
        drv_data = kzalloc(sizeof(*drv_data), GFP_KERNEL);

diff --git a/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c b/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c
index fc57ed63b08b32068d72f00e22e23309004dfc30..802807798846a3ff976019784b51158f16df4b66 100644 (file)
--- a/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c
+++ b/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c
@@ -88,7 +88,6 @@ static int lb035q02_panel_probe(struct omap_dss_device *dssdev)
        struct lb035q02_data *ld;
        int r;
 
-       dssdev->panel.config = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS;
        dssdev->panel.timings = lb035q02_timings;
 
        ld = kzalloc(sizeof(*ld), GFP_KERNEL);

diff --git a/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c b/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c
index 9eab0dda2f3395b2d55ce38af9707eebe7d1d21e..b122b0f31c43b34602a0f8215ca8106819ea3512 100644 (file)
--- a/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c
+++ b/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c
@@ -122,8 +122,6 @@ static int nec_8048_panel_probe(struct omap_dss_device *dssdev)
        struct backlight_properties props;
        int r;
 
-       dssdev->panel.config = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS |
-                               OMAP_DSS_LCD_RF | OMAP_DSS_LCD_ONOFF;
        dssdev->panel.timings = nec_8048_panel_timings;
 
        necd = kzalloc(sizeof(*necd), GFP_KERNEL);

diff --git a/drivers/video/omap2/displays/panel-picodlp.c b/drivers/video/omap2/displays/panel-picodlp.c
index 9363cf4ab74007a453c04ab3e7630acefdea154b..2d35bd388860001c08ddbaf5cc1a551764a2f5a5 100644 (file)
--- a/drivers/video/omap2/displays/panel-picodlp.c
+++ b/drivers/video/omap2/displays/panel-picodlp.c
@@ -420,8 +420,6 @@ static int picodlp_panel_probe(struct omap_dss_device *dssdev)
        struct i2c_client *picodlp_i2c_client;
        int r = 0, picodlp_adapter_id;
 
-       dssdev->panel.config = OMAP_DSS_LCD_ONOFF | OMAP_DSS_LCD_IHS |
-                               OMAP_DSS_LCD_IVS;
        dssdev->panel.timings = pico_ls_timings;
 
        picod =  kzalloc(sizeof(struct picodlp_data), GFP_KERNEL);

diff --git a/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c b/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
index 6b7b43c808e28d6d36be380da750e433c8b16fbe..bd86ba9ccf7600bed53c29c257e164c7dda763ec 100644 (file)
--- a/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
+++ b/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
@@ -92,7 +92,6 @@ static int sharp_ls_panel_probe(struct omap_dss_device *dssdev)
        struct sharp_data *sd;
        int r;
 
-       dssdev->panel.config = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS;
        dssdev->panel.timings = sharp_ls_timings;
 
        sd = kzalloc(sizeof(*sd), GFP_KERNEL);

diff --git a/drivers/video/omap2/displays/panel-tpo-td043mtea1.c b/drivers/video/omap2/displays/panel-tpo-td043mtea1.c
index e627c6c5c5517fe7409dfb2f4796f51e5e15b174..fa7baa650ae06bcc18a911a3e3fed34cb4e6f0b2 100644 (file)
--- a/drivers/video/omap2/displays/panel-tpo-td043mtea1.c
+++ b/drivers/video/omap2/displays/panel-tpo-td043mtea1.c
@@ -429,8 +429,6 @@ static int tpo_td043_probe(struct omap_dss_device *dssdev)
                return -ENODEV;
        }
 
-       dssdev->panel.config = OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IVS |
-                               OMAP_DSS_LCD_IPC;
        dssdev->panel.timings = tpo_td043_timings;
        dssdev->ctrl.pixel_size = 24;
 

diff --git a/drivers/video/omap2/dss/hdmi_panel.c b/drivers/video/omap2/dss/hdmi_panel.c
index 5bf3a84d89cd8ff73aa43b935ab2f3769eea0f2a..723a1378847655ef8460885c65211552a4c90af6 100644 (file)
--- a/drivers/video/omap2/dss/hdmi_panel.c
+++ b/drivers/video/omap2/dss/hdmi_panel.c
@@ -43,8 +43,6 @@ static int hdmi_panel_probe(struct omap_dss_device *dssdev)
 {
        DSSDBG("ENTER hdmi_panel_probe\n");
 
-       dssdev->panel.config = OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS;
-
        dssdev->panel.timings = (struct omap_video_timings)
                        { 640, 480, 25175, 96, 16, 48, 2, 11, 31,
                                OMAPDSS_SIG_ACTIVE_LOW, OMAPDSS_SIG_ACTIVE_LOW,

diff --git a/drivers/video/omap2/dss/sdi.c b/drivers/video/omap2/dss/sdi.c
index 59992a3ed0ee8331f95bb2c6355920034d8bff00..0fcd4d7e202edce64263f2befabb07b74536d7e7 100644 (file)
--- a/drivers/video/omap2/dss/sdi.c
+++ b/drivers/video/omap2/dss/sdi.c
@@ -78,8 +78,6 @@ int omapdss_sdi_display_enable(struct omap_dss_device *dssdev)
        sdi_basic_init(dssdev);
 
        /* 15.5.9.1.2 */
-       dssdev->panel.config |= OMAP_DSS_LCD_RF | OMAP_DSS_LCD_ONOFF;
-
        dssdev->panel.timings.data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE;
        dssdev->panel.timings.sync_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE;
 

diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index be6590dc66a53c2e665c2f6a90a9598c167e7e3a..14f261b584fa798d9127abfdaaaae7c980365f20 100644 (file)
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -121,15 +121,6 @@ enum omap_rfbi_te_mode {
        OMAP_DSS_RFBI_TE_MODE_2 = 2,
 };
 
-enum omap_panel_config {
-       OMAP_DSS_LCD_IVS                = 1<<0,
-       OMAP_DSS_LCD_IHS                = 1<<1,
-       OMAP_DSS_LCD_IPC                = 1<<2,
-       OMAP_DSS_LCD_IEO                = 1<<3,
-       OMAP_DSS_LCD_RF                 = 1<<4,
-       OMAP_DSS_LCD_ONOFF              = 1<<5,
-};
-
 enum omap_dss_signal_level {
        OMAPDSS_SIG_ACTIVE_HIGH = 0,
        OMAPDSS_SIG_ACTIVE_LOW  = 1,
@@ -572,8 +563,6 @@ struct omap_dss_device {
                /* Unit: line clocks */
                int acb;        /* ac-bias pin frequency */
 
-               enum omap_panel_config config;
-
                enum omap_dss_dsi_pixel_format dsi_pix_fmt;
                enum omap_dss_dsi_mode dsi_mode;
                struct omap_dss_dsi_videomode_data dsi_vm_data;