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

Groups > linux.kernel > #1413135

[PATCH v3 11/27] omapfb: connector-hdmi: Remove legacy boot support

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/connector-hdmi.c   | 42 ++++------------------
 include/video/omap-panel-data.h                    | 10 ------
 2 files changed, 6 insertions(+), 46 deletions(-)

diff --git a/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c b/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c
index 6ee4129bc0c0..231b8588a59f 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c
@@ -18,7 +18,6 @@
 #include <drm/drm_edid.h>
 
 #include <video/omapdss.h>
-#include <video/omap-panel-data.h>
 
 static const struct omap_video_timings hdmic_default_timings = {
 	.x_res		= 640,
@@ -206,30 +205,6 @@ static struct omap_dss_driver hdmic_driver = {
 	.set_hdmi_infoframe	= hdmic_set_infoframe,
 };
 
-static int hdmic_probe_pdata(struct platform_device *pdev)
-{
-	struct panel_drv_data *ddata = platform_get_drvdata(pdev);
-	struct connector_hdmi_platform_data *pdata;
-	struct omap_dss_device *in, *dssdev;
-
-	pdata = dev_get_platdata(&pdev->dev);
-
-	ddata->hpd_gpio = -ENODEV;
-
-	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;
-
-	dssdev = &ddata->dssdev;
-	dssdev->name = pdata->name;
-
-	return 0;
-}
-
 static int hdmic_probe_of(struct platform_device *pdev)
 {
 	struct panel_drv_data *ddata = platform_get_drvdata(pdev);
@@ -261,6 +236,9 @@ static int hdmic_probe(struct platform_device *pdev)
 	struct omap_dss_device *dssdev;
 	int r;
 
+	if (!pdev->dev.of_node)
+		return -ENODEV;
+
 	ddata = devm_kzalloc(&pdev->dev, sizeof(*ddata), GFP_KERNEL);
 	if (!ddata)
 		return -ENOMEM;
@@ -268,17 +246,9 @@ static int hdmic_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, ddata);
 	ddata->dev = &pdev->dev;
 
-	if (dev_get_platdata(&pdev->dev)) {
-		r = hdmic_probe_pdata(pdev);
-		if (r)
-			return r;
-	} else if (pdev->dev.of_node) {
-		r = hdmic_probe_of(pdev);
-		if (r)
-			return r;
-	} else {
-		return -ENODEV;
-	}
+	r = hdmic_probe_of(pdev);
+	if (r)
+		return r;
 
 	if (gpio_is_valid(ddata->hpd_gpio)) {
 		r = devm_gpio_request_one(&pdev->dev, ddata->hpd_gpio,
diff --git a/include/video/omap-panel-data.h b/include/video/omap-panel-data.h
index e7b0e889d6d0..c0836b118f67 100644
--- a/include/video/omap-panel-data.h
+++ b/include/video/omap-panel-data.h
@@ -59,16 +59,6 @@ struct connector_dvi_platform_data {
 };
 
 /**
- * connector_hdmi platform data
- * @name: name for this display entity
- * @source: name of the display entity used as a video source
- */
-struct connector_hdmi_platform_data {
-	const char *name;
-	const char *source;
-};
-
-/**
  * connector_atv 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