--- v2
+++ v3
@@ -3,32 +3,31 @@
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
- .../omapfb/displays/panel-lgphilips-lb035q02.c | 56 +++-------------------
- include/video/omap-panel-data.h | 18 -------
- 2 files changed, 6 insertions(+), 68 deletions(-)
+ .../omap2/omapfb/displays/panel-tpo-td028ttec1.c | 43 +++-------------------
+ include/video/omap-panel-data.h | 13 -------
+ 2 files changed, 6 insertions(+), 50 deletions(-)
-diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c
-index 18eb60e9c9ec..6d5207c7b22c 100644
---- a/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c
-+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c
-@@ -17,7 +17,6 @@
+diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c
+index 4d657f3ab679..f4dc023868ae 100644
+--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c
++++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c
+@@ -29,7 +29,6 @@
+ #include <linux/spi/spi.h>
#include <linux/gpio.h>
-
#include <video/omapdss.h>
-#include <video/omap-panel-data.h>
- static struct omap_video_timings lb035q02_timings = {
- .x_res = 320,
-@@ -240,44 +239,6 @@ static struct omap_dss_driver lb035q02_ops = {
- .get_resolution = omapdss_default_get_resolution,
+ struct panel_drv_data {
+ struct omap_dss_device dssdev;
+@@ -365,31 +364,6 @@ static struct omap_dss_driver td028ttec1_ops = {
+ .check_timings = td028ttec1_panel_check_timings,
};
--static int lb035q02_probe_pdata(struct spi_device *spi)
+-static int td028ttec1_panel_probe_pdata(struct spi_device *spi)
-{
-- const struct panel_lb035q02_platform_data *pdata;
+- const struct panel_tpo_td028ttec1_platform_data *pdata;
- struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev);
- struct omap_dss_device *dssdev, *in;
-- int r;
-
- pdata = dev_get_platdata(&spi->dev);
-
@@ -46,79 +45,62 @@
- dssdev = &ddata->dssdev;
- dssdev->name = pdata->name;
-
-- r = devm_gpio_request_one(&spi->dev, pdata->enable_gpio,
-- GPIOF_OUT_INIT_LOW, "panel enable");
-- if (r)
-- goto err_gpio;
--
-- ddata->enable_gpio = gpio_to_desc(pdata->enable_gpio);
--
-- ddata->backlight_gpio = pdata->backlight_gpio;
--
- return 0;
--err_gpio:
-- omap_dss_put_device(ddata->in);
-- return r;
-}
-
- static int lb035q02_probe_of(struct spi_device *spi)
+ static int td028ttec1_probe_of(struct spi_device *spi)
{
struct device_node *node = spi->dev.of_node;
-@@ -312,6 +273,9 @@ static int lb035q02_panel_spi_probe(struct spi_device *spi)
- struct omap_dss_device *dssdev;
- int r;
+@@ -415,6 +389,9 @@ static int td028ttec1_panel_probe(struct spi_device *spi)
+
+ dev_dbg(&spi->dev, "%s\n", __func__);
+ if (!spi->dev.of_node)
+ return -ENODEV;
+
- ddata = devm_kzalloc(&spi->dev, sizeof(*ddata), GFP_KERNEL);
- if (ddata == NULL)
- return -ENOMEM;
-@@ -320,17 +284,9 @@ static int lb035q02_panel_spi_probe(struct spi_device *spi)
+ spi->bits_per_word = 9;
+ spi->mode = SPI_MODE_3;
- ddata->spi = spi;
+@@ -432,17 +409,9 @@ static int td028ttec1_panel_probe(struct spi_device *spi)
+
+ ddata->spi_dev = spi;
- if (dev_get_platdata(&spi->dev)) {
-- r = lb035q02_probe_pdata(spi);
+- r = td028ttec1_panel_probe_pdata(spi);
- if (r)
- return r;
- } else if (spi->dev.of_node) {
-- r = lb035q02_probe_of(spi);
+- r = td028ttec1_probe_of(spi);
- if (r)
- return r;
- } else {
- return -ENODEV;
- }
-+ r = lb035q02_probe_of(spi);
++ r = td028ttec1_probe_of(spi);
+ if (r)
+ return r;
- if (gpio_is_valid(ddata->backlight_gpio)) {
- r = devm_gpio_request_one(&spi->dev, ddata->backlight_gpio,
+ ddata->videomode = td028ttec1_panel_timings;
+
diff --git a/include/video/omap-panel-data.h b/include/video/omap-panel-data.h
-index 085b4171eb25..74486bcc754e 100644
+index 56830d1dc762..fbdaa4c3ae96 100644
--- a/include/video/omap-panel-data.h
+++ b/include/video/omap-panel-data.h
-@@ -147,22 +147,4 @@ struct panel_acx565akm_platform_data {
- int datapairs;
+@@ -223,17 +223,4 @@ struct panel_nec_nl8048hl11_platform_data {
+ int qvga_gpio;
};
-/**
-- * panel_lb035q02 platform data
-- * @name: name for this display entity
+- * panel-tpo-td028ttec1 platform data
+- * @name: name for display entity
- * @source: name of the display entity used as a video source
- * @data_lines: number of DPI datalines
-- * @backlight_gpio: gpio to enable/disable the backlight (or -1)
-- * @enable_gpio: gpio to enable/disable the panel (or -1)
- */
--struct panel_lb035q02_platform_data {
+-struct panel_tpo_td028ttec1_platform_data {
- const char *name;
- const char *source;
-
- int data_lines;
--
-- int backlight_gpio;
-- int enable_gpio;
-};
-
#endif /* __OMAP_PANEL_DATA_H */