--- v1
+++ v3
@@ -1,52 +1,106 @@
-In legacy mode (non DT mode) support only composite connector type. The
-only user for this is rx51, using composite type.
-Dropping the connector_type selection via pdata will allow cleanups in
-omapdss (drm vs fbdev).
+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>
---
- drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
+ .../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/gpu/drm/omapdrm/displays/connector-analog-tv.c b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
-index 8511c648a15c..d963b4a9cfc0 100644
---- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
-+++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c
-@@ -25,7 +25,6 @@ struct panel_drv_data {
+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>
- struct omap_video_timings timings;
+ #include <video/omapdss.h>
+-#include <video/omap-panel-data.h>
-- enum omap_dss_venc_type connector_type;
- bool invert_polarity;
+ 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,
};
-@@ -45,10 +44,6 @@ static const struct omap_video_timings tvc_pal_timings = {
+-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;
- static const struct of_device_id tvc_of_match[];
++ 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;
--struct tvc_of_data {
-- enum omap_dss_venc_type connector_type;
+- 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;
-};
-
- #define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev)
-
- static int tvc_connect(struct omap_dss_device *dssdev)
-@@ -99,7 +94,7 @@ static int tvc_enable(struct omap_dss_device *dssdev)
- in->ops.atv->set_timings(in, &ddata->timings);
-
- if (!ddata->dev->of_node) {
-- in->ops.atv->set_type(in, ddata->connector_type);
-+ in->ops.atv->set_type(in, OMAP_DSS_VENC_TYPE_COMPOSITE);
-
- in->ops.atv->invert_vid_out_polarity(in,
- ddata->invert_polarity);
-@@ -207,7 +202,6 @@ static int tvc_probe_pdata(struct platform_device *pdev)
-
- ddata->in = in;
-
-- ddata->connector_type = pdata->connector_type;
- ddata->invert_polarity = pdata->invert_polarity;
-
- dssdev = &ddata->dssdev;
+-/**
+ * connector_atv platform data
+ * @name: name for this display entity
+ * @source: name of the display entity used as a video source
--
2.8.3