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

Groups > linux.kernel > #1413088 > unrolled thread

[PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack

Started byPeter Ujfalusi <peter.ujfalusi@ti.com>
First post2016-06-03 13:10 +0200
Last post2016-06-07 08:00 +0200
Articles 8 on this page of 28 — 2 participants

Back to article view | Back to linux.kernel

Contents

  [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

Page 2 of 2 — ← Prev page 1 [2]

#1413120 — [PATCH v3 01/27] ARM: OMAP: rx51-video: Do not set TV connector_type

FromPeter Ujfalusi <peter.ujfalusi@ti.com>
Date2016-06-03 13:20 +0200
Subject[PATCH v3 01/27] ARM: OMAP: rx51-video: Do not set TV connector_type
Message-ID<rFViV-2rq-1@gated-at.bofh.it>
In reply to#1413088
OMAP_DSS_VENC_TYPE_COMPOSITE is 0. There is no need to explicitly set the
connector_type.
This change is needed for the omapdss header cleanup.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 arch/arm/mach-omap2/board-rx51-video.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-omap2/board-rx51-video.c b/arch/arm/mach-omap2/board-rx51-video.c
index 9cfebc5c7455..b76f84245ad9 100644
--- a/arch/arm/mach-omap2/board-rx51-video.c
+++ b/arch/arm/mach-omap2/board-rx51-video.c
@@ -32,7 +32,6 @@
 static struct connector_atv_platform_data rx51_tv_pdata = {
 	.name = "tv",
 	.source = "venc.0",
-	.connector_type = OMAP_DSS_VENC_TYPE_COMPOSITE,
 	.invert_polarity = false,
 };
 
-- 
2.8.3

[toc] | [prev] | [next] | [standalone]

#1413126 — [PATCH v3 03/27] video/platform_data: omapdss: Create new header file for platform data

FromPeter Ujfalusi <peter.ujfalusi@ti.com>
Date2016-06-03 13:20 +0200
Subject[PATCH v3 03/27] video/platform_data: omapdss: Create new header file for platform data
Message-ID<rFViW-2rq-17@gated-at.bofh.it>
In reply to#1413088
Create a new header file for platform data used by omapdss.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 include/linux/platform_data/omapdss.h | 42 +++++++++++++++++++++++++++++++++++
 include/video/omapdss.h               | 28 +----------------------
 2 files changed, 43 insertions(+), 27 deletions(-)
 create mode 100644 include/linux/platform_data/omapdss.h

diff --git a/include/linux/platform_data/omapdss.h b/include/linux/platform_data/omapdss.h
new file mode 100644
index 000000000000..dbb875abc44a
--- /dev/null
+++ b/include/linux/platform_data/omapdss.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2016 Texas Instruments, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __OMAPDSS_PDATA_H
+#define __OMAPDSS_PDATA_H
+
+enum omapdss_version {
+	OMAPDSS_VER_UNKNOWN = 0,
+	OMAPDSS_VER_OMAP24xx,
+	OMAPDSS_VER_OMAP34xx_ES1,	/* OMAP3430 ES1.0, 2.0 */
+	OMAPDSS_VER_OMAP34xx_ES3,	/* OMAP3430 ES3.0+ */
+	OMAPDSS_VER_OMAP3630,
+	OMAPDSS_VER_AM35xx,
+	OMAPDSS_VER_OMAP4430_ES1,	/* OMAP4430 ES1.0 */
+	OMAPDSS_VER_OMAP4430_ES2,	/* OMAP4430 ES2.0, 2.1, 2.2 */
+	OMAPDSS_VER_OMAP4,		/* All other OMAP4s */
+	OMAPDSS_VER_OMAP5,
+	OMAPDSS_VER_AM43xx,
+	OMAPDSS_VER_DRA7xx,
+};
+
+struct omap_dss_device;
+
+/* Board specific data */
+struct omap_dss_board_info {
+	int num_devices;
+	struct omap_dss_device **devices;
+	struct omap_dss_device *default_device;
+	const char *default_display_name;
+	int (*dsi_enable_pads)(int dsi_id, unsigned int lane_mask);
+	void (*dsi_disable_pads)(int dsi_id, unsigned int lane_mask);
+	int (*set_min_bus_tput)(struct device *dev, unsigned long r);
+	enum omapdss_version version;
+};
+
+#endif /* __OMAPDSS_PDATA_H */
diff --git a/include/video/omapdss.h b/include/video/omapdss.h
index 0c7ae93ebd76..53ada70cf23c 100644
--- a/include/video/omapdss.h
+++ b/include/video/omapdss.h
@@ -22,6 +22,7 @@
 #include <linux/kobject.h>
 #include <linux/device.h>
 #include <linux/interrupt.h>
+#include <linux/platform_data/omapdss.h>
 
 #include <video/videomode.h>
 
@@ -303,33 +304,6 @@ struct omap_dss_dsi_config {
 	enum omap_dss_dsi_trans_mode trans_mode;
 };
 
-enum omapdss_version {
-	OMAPDSS_VER_UNKNOWN = 0,
-	OMAPDSS_VER_OMAP24xx,
-	OMAPDSS_VER_OMAP34xx_ES1,	/* OMAP3430 ES1.0, 2.0 */
-	OMAPDSS_VER_OMAP34xx_ES3,	/* OMAP3430 ES3.0+ */
-	OMAPDSS_VER_OMAP3630,
-	OMAPDSS_VER_AM35xx,
-	OMAPDSS_VER_OMAP4430_ES1,	/* OMAP4430 ES1.0 */
-	OMAPDSS_VER_OMAP4430_ES2,	/* OMAP4430 ES2.0, 2.1, 2.2 */
-	OMAPDSS_VER_OMAP4,		/* All other OMAP4s */
-	OMAPDSS_VER_OMAP5,
-	OMAPDSS_VER_AM43xx,
-	OMAPDSS_VER_DRA7xx,
-};
-
-/* Board specific data */
-struct omap_dss_board_info {
-	int num_devices;
-	struct omap_dss_device **devices;
-	struct omap_dss_device *default_device;
-	const char *default_display_name;
-	int (*dsi_enable_pads)(int dsi_id, unsigned lane_mask);
-	void (*dsi_disable_pads)(int dsi_id, unsigned lane_mask);
-	int (*set_min_bus_tput)(struct device *dev, unsigned long r);
-	enum omapdss_version version;
-};
-
 struct omap_video_timings {
 	/* Unit: pixels */
 	u16 x_res;
-- 
2.8.3

[toc] | [prev] | [next] | [standalone]

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

FromPeter Ujfalusi <peter.ujfalusi@ti.com>
Date2016-06-03 13:20 +0200
Subject[PATCH v3 10/27] omapfb: panel-dsi-cm: Remove legacy boot support
Message-ID<rFViW-2rq-19@gated-at.bofh.it>
In reply to#1413088
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

[toc] | [prev] | [next] | [standalone]

#1413130 — [PATCH v3 06/27] omapfb: panel-nec-nl8048hl11: Remove legacy boot support

FromPeter Ujfalusi <peter.ujfalusi@ti.com>
Date2016-06-03 13:20 +0200
Subject[PATCH v3 06/27] omapfb: panel-nec-nl8048hl11: Remove legacy boot support
Message-ID<rFViW-2rq-23@gated-at.bofh.it>
In reply to#1413088
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>
---
 .../omap2/omapfb/displays/panel-nec-nl8048hl11.c   | 45 +++-------------------
 include/video/omap-panel-data.h                    | 18 ---------
 2 files changed, 6 insertions(+), 57 deletions(-)

diff --git a/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c b/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c
index 8a928c9a2fc9..3852cea3c947 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c
@@ -19,7 +19,6 @@
 #include <linux/of_gpio.h>
 
 #include <video/omapdss.h>
-#include <video/omap-panel-data.h>
 
 struct panel_drv_data {
 	struct omap_dss_device	dssdev;
@@ -233,33 +232,6 @@ static struct omap_dss_driver nec_8048_ops = {
 };
 
 
-static int nec_8048_probe_pdata(struct spi_device *spi)
-{
-	const struct panel_nec_nl8048hl11_platform_data *pdata;
-	struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev);
-	struct omap_dss_device *dssdev, *in;
-
-	pdata = dev_get_platdata(&spi->dev);
-
-	ddata->qvga_gpio = pdata->qvga_gpio;
-	ddata->res_gpio = pdata->res_gpio;
-
-	in = omap_dss_find_output(pdata->source);
-	if (in == NULL) {
-		dev_err(&spi->dev, "failed to find video source '%s'\n",
-				pdata->source);
-		return -EPROBE_DEFER;
-	}
-	ddata->in = in;
-
-	ddata->data_lines = pdata->data_lines;
-
-	dssdev = &ddata->dssdev;
-	dssdev->name = pdata->name;
-
-	return 0;
-}
-
 static int nec_8048_probe_of(struct spi_device *spi)
 {
 	struct device_node *node = spi->dev.of_node;
@@ -296,6 +268,9 @@ static int nec_8048_probe(struct spi_device *spi)
 
 	dev_dbg(&spi->dev, "%s\n", __func__);
 
+	if (!spi->dev.of_node)
+		return -ENODEV;
+
 	spi->mode = SPI_MODE_0;
 	spi->bits_per_word = 32;
 
@@ -315,17 +290,9 @@ static int nec_8048_probe(struct spi_device *spi)
 
 	ddata->spi = spi;
 
-	if (dev_get_platdata(&spi->dev)) {
-		r = nec_8048_probe_pdata(spi);
-		if (r)
-			return r;
-	} else if (spi->dev.of_node) {
-		r = nec_8048_probe_of(spi);
-		if (r)
-			return r;
-	} else {
-		return -ENODEV;
-	}
+	r = nec_8048_probe_of(spi);
+	if (r)
+		return r;
 
 	if (gpio_is_valid(ddata->qvga_gpio)) {
 		r = devm_gpio_request_one(&spi->dev, ddata->qvga_gpio,
diff --git a/include/video/omap-panel-data.h b/include/video/omap-panel-data.h
index fbdaa4c3ae96..a0c95cd1ed11 100644
--- a/include/video/omap-panel-data.h
+++ b/include/video/omap-panel-data.h
@@ -205,22 +205,4 @@ struct panel_tpo_td043mtea1_platform_data {
 	int nreset_gpio;
 };
 
-/**
- * panel-nec-nl8048hl11 platform data
- * @name: name for this display entity
- * @source: name of the display entity used as a video source
- * @data_lines: number of DPI datalines
- * @res_gpio: reset signal
- * @qvga_gpio: selection for resolution(QVGA/WVGA)
- */
-struct panel_nec_nl8048hl11_platform_data {
-	const char *name;
-	const char *source;
-
-	int data_lines;
-
-	int res_gpio;
-	int qvga_gpio;
-};
-
 #endif /* __OMAP_PANEL_DATA_H */
-- 
2.8.3

[toc] | [prev] | [next] | [standalone]

#1413134 — [PATCH v3 14/27] omapfb: encoder-tpd12s015: No need to include video/omap-panle-data.h

FromPeter Ujfalusi <peter.ujfalusi@ti.com>
Date2016-06-03 13:20 +0200
Subject[PATCH v3 14/27] omapfb: encoder-tpd12s015: No need to include video/omap-panle-data.h
Message-ID<rFViW-2rq-35@gated-at.bofh.it>
In reply to#1413088
The driver does not support legacy (pdata) based probing.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c b/drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c
index 677e2545fcbe..7939157af957 100644
--- a/drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c
@@ -17,7 +17,6 @@
 #include <linux/gpio/consumer.h>
 
 #include <video/omapdss.h>
-#include <video/omap-panel-data.h>
 
 struct panel_drv_data {
 	struct omap_dss_device dssdev;
-- 
2.8.3

[toc] | [prev] | [next] | [standalone]

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

FromPeter Ujfalusi <peter.ujfalusi@ti.com>
Date2016-06-03 13:20 +0200
Subject[PATCH v3 11/27] omapfb: connector-hdmi: Remove legacy boot support
Message-ID<rFViX-2rq-45@gated-at.bofh.it>
In reply to#1413088
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

[toc] | [prev] | [next] | [standalone]

#1413223 — Re: [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack

FromPeter Ujfalusi <peter.ujfalusi@ti.com>
Date2016-06-03 15:10 +0200
SubjectRe: [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack
Message-ID<rFX1p-3yL-43@gated-at.bofh.it>
In reply to#1413088
Tony,

On 06/03/16 14:03, Peter Ujfalusi wrote:
> Hi,
> 
> Changes since v2:
> - Collected the patches (4 of them) at the beginning which touches mach-omap2
> - Smaller changes in the moved patches to make sure they compile.
> 
> Changes since v1:
> - patches (2) added to remove the inclusion of video/omap-panel-data.h when it
>   is not needed
> - Transitional patch to create the video/omapfb_dss.h has been changed to copy
>   the content of the omapdss.h in one step.
> 
> I have prepared two branches on top of v4.7-rc1:
> [1] https://github.com/omap-audio/linux-audio.git peter/for-4.8_omapdss_part1
> 
> containing:
>   ARM: OMAP: rx51-video: Do not set TV connector_type
>   ARM/video: omap2: Move omap_display_init declaration to
>     mach-omap2/display.h
>   video/platform_data: omapdss: Create new header file for platform data
>   ARM: OMAP2: Use the platform_data header for omapdss

I have added your Acked-by to the ARM: OMAP patches to speed things up, please
let me know if that is OK.

> 
> [2] https://github.com/omap-audio/linux-audio.git peter/for-4.8_omapdss_part2
> 
> containing the whole set, including part1.
> 
> Only patches in part1 branch are touching arch/arm/mach-omap2/ files.
> 
> omapfb is deprecated. It will not receive new features, only bug fixes. On the.
> other hand omapdrm is in active development and the fact that both
> implementation (omapfb and omapdrm) is using the same header file
> (video/omapdss.h) makes implementing new features or doing bigger clean ups in
> omapdrm harder and hared as the change should not break omapfb.
> 
> To overcome this issue we need to separate the two implementation. This is the
> aim of this series:
> Create platform_data header for omapdss,
> clean up the header usage and dependencies,
> new header file for omapfb stack (video/omapfb_dss.h)
> local omapdss.h header file for omapdrm.
> 
> Regards,
> Peter
> ---
> Peter Ujfalusi (27):
>   ARM: OMAP: rx51-video: Do not set TV connector_type
>   ARM/video: omap2: Move omap_display_init declaration to
>     mach-omap2/display.h
>   video/platform_data: omapdss: Create new header file for platform data
>   ARM: OMAP2: Use the platform_data header for omapdss
>   omapfb: panel-tpo-td028ttec1: Remove legacy boot support
>   omapfb: panel-nec-nl8048hl11: Remove legacy boot support
>   omapfb: panel-tpo-td043mtea1: Remove legacy boot support
>   omapfb: panel-sharp-ls037v7dw01: Remove legacy boot support
>   omapfb: panel-lgphilips-lb035q02: Remove legacy boot support
>   omapfb: panel-dsi-cm: Remove legacy boot support
>   omapfb: connector-hdmi: Remove legacy boot support
>   omapfb: connector-dvi: Remove legacy boot support
>   omapfb: encoder-tfp410: Remove legacy boot support
>   omapfb: encoder-tpd12s015: No need to include video/omap-panle-data.h
>   drm/omap: displays: Do not include video/omap-panel-data.h if not
>     needed
>   omapdss: omap-panel-data.h: Remove struct omap_dss_device declaration
>   drm/omap: connector-analog-tv: Support only Composite type in legacy
>     boot
>   omapfb: connector-analog-tv: Support only Composite type in legacy
>     boot
>   omapdss: omap-panel-data.h: Remove connector_type from atv pdata
>   drm/omap: Remove reference to pdata->default_device
>   omapfb: Remove reference to pdata->default_device
>   platform_data: omapdss: Remove unused members from omap_dss_board_info
>   omapdss: hdmi audio: Make header file independent of video/omapdss.h
>   drm/omap: Do not include video/omapdss.h directly in drivers
>   omapfb: Create new header file for omapfb DSS implementation
>   [media] omap_vout: Switch to use the video/omapfb_dss.h header file
>   drm/omap: Remove the video/omapdss.h and move it's content to local
>     header file
> 
>  arch/arm/mach-omap2/board-ldp.c                    |   3 +-
>  arch/arm/mach-omap2/board-rx51-video.c             |   4 +-
>  arch/arm/mach-omap2/display.c                      |   2 +-
>  arch/arm/mach-omap2/display.h                      |   5 +
>  arch/arm/mach-omap2/dss-common.c                   |   2 +-
>  .../gpu/drm/omapdrm/displays/connector-analog-tv.c |  11 +-
>  drivers/gpu/drm/omapdrm/displays/connector-dvi.c   |   4 +-
>  drivers/gpu/drm/omapdrm/displays/connector-hdmi.c  |   4 +-
>  drivers/gpu/drm/omapdrm/displays/encoder-opa362.c  |   2 +-
>  drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c  |   3 +-
>  .../gpu/drm/omapdrm/displays/encoder-tpd12s015.c   |   3 +-
>  drivers/gpu/drm/omapdrm/displays/panel-dpi.c       |   3 +-
>  drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c    |   4 +-
>  .../omapdrm/displays/panel-lgphilips-lb035q02.c    |   3 +-
>  .../drm/omapdrm/displays/panel-nec-nl8048hl11.c    |   2 +-
>  .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c |   3 +-
>  .../drm/omapdrm/displays/panel-sony-acx565akm.c    |   3 +-
>  .../drm/omapdrm/displays/panel-tpo-td028ttec1.c    |   3 +-
>  .../drm/omapdrm/displays/panel-tpo-td043mtea1.c    |   2 +-
>  drivers/gpu/drm/omapdrm/dss/core.c                 |   5 +-
>  drivers/gpu/drm/omapdrm/dss/dispc.c                |   3 +-
>  drivers/gpu/drm/omapdrm/dss/dispc_coefs.c          |   2 +-
>  drivers/gpu/drm/omapdrm/dss/display.c              |   2 +-
>  drivers/gpu/drm/omapdrm/dss/dpi.c                  |   3 +-
>  drivers/gpu/drm/omapdrm/dss/dsi.c                  |   2 +-
>  drivers/gpu/drm/omapdrm/dss/dss-of.c               |   3 +-
>  drivers/gpu/drm/omapdrm/dss/dss.c                  |   3 +-
>  drivers/gpu/drm/omapdrm/dss/dss_features.c         |   3 +-
>  drivers/gpu/drm/omapdrm/dss/hdmi.h                 |   3 +-
>  drivers/gpu/drm/omapdrm/dss/hdmi4.c                |   2 +-
>  drivers/gpu/drm/omapdrm/dss/hdmi5.c                |   2 +-
>  drivers/gpu/drm/omapdrm/dss/hdmi_common.c          |   2 +-
>  drivers/gpu/drm/omapdrm/dss/hdmi_phy.c             |   2 +-
>  drivers/gpu/drm/omapdrm/dss/hdmi_pll.c             |   3 +-
>  drivers/gpu/drm/omapdrm/dss/hdmi_wp.c              |   2 +-
>  drivers/gpu/drm/omapdrm/dss/omapdss.h              | 866 ++++++++++++++++++++-
>  drivers/gpu/drm/omapdrm/dss/output.c               |   3 +-
>  drivers/gpu/drm/omapdrm/dss/pll.c                  |   3 +-
>  drivers/gpu/drm/omapdrm/dss/rfbi.c                 |   2 +-
>  drivers/gpu/drm/omapdrm/dss/sdi.c                  |   2 +-
>  drivers/gpu/drm/omapdrm/dss/venc.c                 |   3 +-
>  drivers/gpu/drm/omapdrm/dss/video-pll.c            |   3 +-
>  drivers/gpu/drm/omapdrm/omap_drv.h                 |   1 -
>  drivers/media/platform/omap/omap_vout.c            |   2 +-
>  drivers/media/platform/omap/omap_voutdef.h         |   2 +-
>  drivers/media/platform/omap/omap_voutlib.c         |   2 +-
>  .../omap2/omapfb/displays/connector-analog-tv.c    |  10 +-
>  .../fbdev/omap2/omapfb/displays/connector-dvi.c    |  60 +-
>  .../fbdev/omap2/omapfb/displays/connector-hdmi.c   |  44 +-
>  .../fbdev/omap2/omapfb/displays/encoder-opa362.c   |   2 +-
>  .../fbdev/omap2/omapfb/displays/encoder-tfp410.c   |  46 +-
>  .../omap2/omapfb/displays/encoder-tpd12s015.c      |   3 +-
>  .../video/fbdev/omap2/omapfb/displays/panel-dpi.c  |   2 +-
>  .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c     |  54 +-
>  .../omapfb/displays/panel-lgphilips-lb035q02.c     |  58 +-
>  .../omap2/omapfb/displays/panel-nec-nl8048hl11.c   |  47 +-
>  .../omapfb/displays/panel-sharp-ls037v7dw01.c      |  83 +-
>  .../omap2/omapfb/displays/panel-sony-acx565akm.c   |   2 +-
>  .../omap2/omapfb/displays/panel-tpo-td028ttec1.c   |  45 +-
>  .../omap2/omapfb/displays/panel-tpo-td043mtea1.c   |  46 +-
>  drivers/video/fbdev/omap2/omapfb/dss/apply.c       |   2 +-
>  drivers/video/fbdev/omap2/omapfb/dss/core.c        |   4 +-
>  .../video/fbdev/omap2/omapfb/dss/dispc-compat.c    |   2 +-
>  drivers/video/fbdev/omap2/omapfb/dss/dispc.c       |   2 +-
>  drivers/video/fbdev/omap2/omapfb/dss/dispc_coefs.c |   2 +-
>  .../video/fbdev/omap2/omapfb/dss/display-sysfs.c   |   2 +-
>  drivers/video/fbdev/omap2/omapfb/dss/display.c     |   2 +-
>  drivers/video/fbdev/omap2/omapfb/dss/dpi.c         |   2 +-
>  drivers/video/fbdev/omap2/omapfb/dss/dsi.c         |   2 +-
>  drivers/video/fbdev/omap2/omapfb/dss/dss-of.c      |   2 +-
>  drivers/video/fbdev/omap2/omapfb/dss/dss.c         |   2 +-
>  .../video/fbdev/omap2/omapfb/dss/dss_features.c    |   2 +-
>  drivers/video/fbdev/omap2/omapfb/dss/hdmi.h        |   3 +-
>  drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c       |   2 +-
>  drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c       |   2 +-
>  drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c |   2 +-
>  drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c    |   2 +-
>  drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c    |   2 +-
>  drivers/video/fbdev/omap2/omapfb/dss/hdmi_wp.c     |   2 +-
>  .../video/fbdev/omap2/omapfb/dss/manager-sysfs.c   |   2 +-
>  drivers/video/fbdev/omap2/omapfb/dss/manager.c     |   2 +-
>  drivers/video/fbdev/omap2/omapfb/dss/output.c      |   2 +-
>  .../video/fbdev/omap2/omapfb/dss/overlay-sysfs.c   |   2 +-
>  drivers/video/fbdev/omap2/omapfb/dss/overlay.c     |   2 +-
>  drivers/video/fbdev/omap2/omapfb/dss/pll.c         |   2 +-
>  drivers/video/fbdev/omap2/omapfb/dss/rfbi.c        |   2 +-
>  drivers/video/fbdev/omap2/omapfb/dss/sdi.c         |   2 +-
>  drivers/video/fbdev/omap2/omapfb/dss/venc.c        |   2 +-
>  drivers/video/fbdev/omap2/omapfb/dss/video-pll.c   |   2 +-
>  drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c    |   2 +-
>  drivers/video/fbdev/omap2/omapfb/omapfb-main.c     |   2 +-
>  drivers/video/fbdev/omap2/omapfb/omapfb-sysfs.c    |   2 +-
>  drivers/video/fbdev/omap2/omapfb/omapfb.h          |   2 +-
>  include/linux/platform_data/omapdss.h              |  37 +
>  include/sound/omap-hdmi-audio.h                    |   9 +-
>  include/video/omap-panel-data.h                    | 157 ----
>  include/video/{omapdss.h => omapfb_dss.h}          |  60 +-
>  sound/soc/omap/omap-hdmi-audio.c                   |   1 -
>  98 files changed, 1081 insertions(+), 751 deletions(-)
>  create mode 100644 include/linux/platform_data/omapdss.h
>  rename include/video/{omapdss.h => omapfb_dss.h} (93%)
> 


-- 
Péter

[toc] | [prev] | [next] | [standalone]

#1415715 — Re: [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack

FromTony Lindgren <tony@atomide.com>
Date2016-06-07 08:00 +0200
SubjectRe: [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack
Message-ID<rHidr-73B-1@gated-at.bofh.it>
In reply to#1413223
* Peter Ujfalusi <peter.ujfalusi@ti.com> [160603 06:10]:
> On 06/03/16 14:03, Peter Ujfalusi wrote:
> > 
> > I have prepared two branches on top of v4.7-rc1:
> > [1] https://github.com/omap-audio/linux-audio.git peter/for-4.8_omapdss_part1
> > 
> > containing:
> >   ARM: OMAP: rx51-video: Do not set TV connector_type
> >   ARM/video: omap2: Move omap_display_init declaration to
> >     mach-omap2/display.h
> >   video/platform_data: omapdss: Create new header file for platform data
> >   ARM: OMAP2: Use the platform_data header for omapdss
> 
> I have added your Acked-by to the ARM: OMAP patches to speed things up, please
> let me know if that is OK.

Well in general not, but seems OK to me in this case.

If peter/for-4.8_omapdss_part1 is now considered immutable, can
you please send me a pull request that I can merge it into
omap-for-v4.8/soc too?

Regards,

Tony

[toc] | [prev] | [standalone]

Page 2 of 2 — ← Prev page 1 [2]

Back to top | Article view | linux.kernel

csiph-web