Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1413128

[PATCH v3 10/27] omapfb: panel-dsi-cm: Remove legacy boot support

From Peter Ujfalusi <peter.ujfalusi@ti.com>
Newsgroups linux.kernel
Subject [PATCH v3 10/27] omapfb: panel-dsi-cm: Remove legacy boot support
Date 2016-06-03 13:20 +0200
Message-ID <rFViW-2rq-19@gated-at.bofh.it> (permalink)
References <rFV9f-2o1-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

The panel is not used by any legacy board files so the legacy (pdata) boot
support can be dropped.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c     | 52 +++-------------------
 include/video/omap-panel-data.h                    | 27 -----------
 2 files changed, 6 insertions(+), 73 deletions(-)

diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c
index 3414c2609320..a4eac6962b76 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c
@@ -26,7 +26,6 @@
 #include <linux/of_gpio.h>
 
 #include <video/omapdss.h>
-#include <video/omap-panel-data.h>
 #include <video/mipi_display.h>
 
 /* DSI Virtual channel. Hardcoded for now. */
@@ -1127,40 +1126,6 @@ static struct omap_dss_driver dsicm_ops = {
 	.memory_read	= dsicm_memory_read,
 };
 
-static int dsicm_probe_pdata(struct platform_device *pdev)
-{
-	const struct panel_dsicm_platform_data *pdata;
-	struct panel_drv_data *ddata = platform_get_drvdata(pdev);
-	struct omap_dss_device *dssdev, *in;
-
-	pdata = dev_get_platdata(&pdev->dev);
-
-	in = omap_dss_find_output(pdata->source);
-	if (in == NULL) {
-		dev_err(&pdev->dev, "failed to find video source\n");
-		return -EPROBE_DEFER;
-	}
-	ddata->in = in;
-
-	ddata->reset_gpio = pdata->reset_gpio;
-
-	if (pdata->use_ext_te)
-		ddata->ext_te_gpio = pdata->ext_te_gpio;
-	else
-		ddata->ext_te_gpio = -1;
-
-	ddata->ulps_timeout = pdata->ulps_timeout;
-
-	ddata->use_dsi_backlight = pdata->use_dsi_backlight;
-
-	ddata->pin_config = pdata->pin_config;
-
-	dssdev = &ddata->dssdev;
-	dssdev->name = pdata->name;
-
-	return 0;
-}
-
 static int dsicm_probe_of(struct platform_device *pdev)
 {
 	struct device_node *node = pdev->dev.of_node;
@@ -1207,6 +1172,9 @@ static int dsicm_probe(struct platform_device *pdev)
 
 	dev_dbg(dev, "probe\n");
 
+	if (!pdev->dev.of_node)
+		return -ENODEV;
+
 	ddata = devm_kzalloc(dev, sizeof(*ddata), GFP_KERNEL);
 	if (!ddata)
 		return -ENOMEM;
@@ -1214,17 +1182,9 @@ static int dsicm_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, ddata);
 	ddata->pdev = pdev;
 
-	if (dev_get_platdata(dev)) {
-		r = dsicm_probe_pdata(pdev);
-		if (r)
-			return r;
-	} else if (pdev->dev.of_node) {
-		r = dsicm_probe_of(pdev);
-		if (r)
-			return r;
-	} else {
-		return -ENODEV;
-	}
+	r = dsicm_probe_of(pdev);
+	if (r)
+		return r;
 
 	ddata->timings.x_res = 864;
 	ddata->timings.y_res = 480;
diff --git a/include/video/omap-panel-data.h b/include/video/omap-panel-data.h
index 74486bcc754e..e7b0e889d6d0 100644
--- a/include/video/omap-panel-data.h
+++ b/include/video/omap-panel-data.h
@@ -105,33 +105,6 @@ struct panel_dpi_platform_data {
 };
 
 /**
- * panel_dsicm platform data
- * @name: name for this display entity
- * @source: name of the display entity used as a video source
- * @reset_gpio: gpio to reset the panel (or -1)
- * @use_ext_te: use external TE GPIO
- * @ext_te_gpio: external TE GPIO
- * @ulps_timeout: time to wait before entering ULPS, 0 = disabled (ms)
- * @use_dsi_backlight: true if panel uses DSI command to control backlight
- * @pin_config: DSI pin configuration
- */
-struct panel_dsicm_platform_data {
-	const char *name;
-	const char *source;
-
-	int reset_gpio;
-
-	bool use_ext_te;
-	int ext_te_gpio;
-
-	unsigned ulps_timeout;
-
-	bool use_dsi_backlight;
-
-	struct omap_dsi_pin_config pin_config;
-};
-
-/**
  * panel_acx565akm platform data
  * @name: name for this display entity
  * @source: name of the display entity used as a video source
-- 
2.8.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-03 13:10 +0200
  [PATCH v3 02/27] ARM/video: omap2: Move omap_display_init declaration to mach-omap2/display.h Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-03 13:10 +0200
  [PATCH v3 13/27] omapfb: encoder-tfp410: Remove legacy boot support Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-03 13:10 +0200
  [PATCH v3 09/27] omapfb: panel-lgphilips-lb035q02: Remove legacy boot support Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-03 13:10 +0200
  [PATCH v3 20/27] drm/omap: Remove reference to pdata->default_device Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-03 13:10 +0200
  [PATCH v3 16/27] omapdss: omap-panel-data.h: Remove struct omap_dss_device declaration Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-03 13:10 +0200
  [PATCH v3 05/27] omapfb: panel-tpo-td028ttec1: Remove legacy boot support Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-03 13:10 +0200
  [PATCH v3 17/27] drm/omap: connector-analog-tv: Support only Composite type in legacy boot Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-03 13:10 +0200
  [PATCH v3 23/27] omapdss: hdmi audio: Make header file independent of video/omapdss.h Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-03 13:10 +0200
  [PATCH v3 19/27] omapdss: omap-panel-data.h: Remove connector_type from atv pdata Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-03 13:10 +0200
  [PATCH v3 15/27] drm/omap: displays: Do not include video/omap-panel-data.h if not needed Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-03 13:10 +0200
  [PATCH v3 18/27] omapfb: connector-analog-tv: Support only Composite type in legacy boot Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-03 13:10 +0200
  [PATCH v3 24/27] drm/omap: Do not include video/omapdss.h directly in drivers Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-03 13:10 +0200
  [PATCH v3 21/27] omapfb: Remove reference to pdata->default_device Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-03 13:10 +0200
  [PATCH v3 26/27] [media] omap_vout: Switch to use the video/omapfb_dss.h header file Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-03 13:10 +0200
  [PATCH v3 08/27] omapfb: panel-sharp-ls037v7dw01: Remove legacy boot support Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-03 13:10 +0200
  [PATCH v3 22/27] platform_data: omapdss: Remove unused members from omap_dss_board_info Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-03 13:10 +0200
  [PATCH v3 12/27] omapfb: connector-dvi: Remove legacy boot support Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-03 13:10 +0200
  [PATCH v3 07/27] omapfb: panel-tpo-td043mtea1: Remove legacy boot support Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-03 13:10 +0200
  [PATCH v3 04/27] ARM: OMAP2: Use the platform_data header for omapdss Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-03 13:10 +0200
  [PATCH v3 01/27] ARM: OMAP: rx51-video: Do not set TV connector_type Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-03 13:20 +0200
  [PATCH v3 03/27] video/platform_data: omapdss: Create new header file for platform data Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-03 13:20 +0200
  [PATCH v3 10/27] omapfb: panel-dsi-cm: Remove legacy boot support Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-03 13:20 +0200
  [PATCH v3 06/27] omapfb: panel-nec-nl8048hl11: Remove legacy boot support Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-03 13:20 +0200
  [PATCH v3 14/27] omapfb: encoder-tpd12s015: No need to include video/omap-panle-data.h Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-03 13:20 +0200
  [PATCH v3 11/27] omapfb: connector-hdmi: Remove legacy boot support Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-03 13:20 +0200
  Re: [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and  separate the two stack Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-06-03 15:10 +0200
    Re: [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and  separate the two stack Tony Lindgren <tony@atomide.com> - 2016-06-07 08:00 +0200

csiph-web