From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: <tomi.valkeinen@ti.com>, <plagnioj@jcrosoft.com>,
<robdclark@gmail.com>, <airlied@linux.ie>, <tony@atomide.com>
Cc: <linux-fbdev@vger.kernel.org>, <linux-omap@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
<laurent.pinchart@ideasonboard.com>, <jsarha@ti.com>,
<dri-devel@lists.freedesktop.org>
Subject: [PATCH v2 07/27] omapfb: connector-hdmi: Remove legacy boot support
Date: Wed, 1 Jun 2016 11:35:29 +0300 [thread overview]
Message-ID: <20160601083549.10549-8-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <20160601083549.10549-1-peter.ujfalusi@ti.com>
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
next prev parent reply other threads:[~2016-06-01 8:36 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-01 8:35 [PATCH v2 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
2016-06-01 8:35 ` [PATCH v2 01/27] omapfb: panel-tpo-td028ttec1: Remove legacy boot support Peter Ujfalusi
2016-06-01 8:35 ` [PATCH v2 02/27] omapfb: panel-nec-nl8048hl11: " Peter Ujfalusi
2016-06-01 8:35 ` [PATCH v2 03/27] omapfb: panel-tpo-td043mtea1: " Peter Ujfalusi
2016-06-01 8:35 ` [PATCH v2 04/27] omapfb: panel-sharp-ls037v7dw01: " Peter Ujfalusi
2016-06-01 8:35 ` [PATCH v2 05/27] omapfb: panel-lgphilips-lb035q02: " Peter Ujfalusi
2016-06-01 8:35 ` [PATCH v2 06/27] omapfb: panel-dsi-cm: " Peter Ujfalusi
2016-06-01 8:35 ` Peter Ujfalusi [this message]
2016-06-01 8:35 ` [PATCH v2 08/27] omapfb: connector-dvi: " Peter Ujfalusi
2016-06-01 8:35 ` [PATCH v2 09/27] omapfb: encoder-tfp410: " Peter Ujfalusi
2016-06-01 8:35 ` [PATCH v2 10/27] omapfb: encoder-tpd12s015: No need to include video/omap-panle-data.h Peter Ujfalusi
2016-06-01 8:35 ` [PATCH v2 11/27] drm/omap: displays: Do not include video/omap-panel-data.h if not needed Peter Ujfalusi
2016-06-01 8:35 ` [PATCH v2 12/27] omapdss: omap-panel-data.h: Remove struct omap_dss_device declaration Peter Ujfalusi
2016-06-01 8:35 ` [PATCH v2 13/27] drm/omap: connector-analog-tv: Support only Composite type in legacy boot Peter Ujfalusi
2016-06-01 8:35 ` [PATCH v2 14/27] omapfb: " Peter Ujfalusi
2016-06-01 8:35 ` [PATCH v2 15/27] ARM: OMAP: rx51-video: Do not set TV connector_type Peter Ujfalusi
2016-06-01 8:35 ` [PATCH v2 16/27] omapdss: omap-panel-data.h: Remove connector_type from atv pdata Peter Ujfalusi
2016-06-01 8:35 ` [PATCH v2 17/27] ARM/video: omap2: Move omap_display_init declaration to mach-omap2/display.h Peter Ujfalusi
2016-06-01 8:35 ` [PATCH v2 18/27] drm/omap: Remove reference to pdata->default_device Peter Ujfalusi
2016-06-01 8:35 ` [PATCH v2 19/27] omapfb: " Peter Ujfalusi
2016-06-01 8:35 ` [PATCH v2 20/27] video: omapdss: Remove unused members from struct omap_dss_board_info Peter Ujfalusi
2016-06-01 8:35 ` [PATCH v2 21/27] video/platform_data: omapdss: Create new header file for platform data Peter Ujfalusi
2016-06-01 8:35 ` [PATCH v2 22/27] ARM: OMAP2: Use the platform_data header for omapdss Peter Ujfalusi
2016-06-01 8:35 ` [PATCH v2 23/27] omapdss: hdmi audio: Make header file independent of video/omapdss.h Peter Ujfalusi
2016-06-01 8:35 ` [PATCH v2 24/27] drm/omap: Do not include video/omapdss.h directly in drivers Peter Ujfalusi
2016-06-01 8:35 ` [PATCH v2 25/27] omapfb: Create new header file for omapfb DSS implementation Peter Ujfalusi
2016-06-01 8:35 ` [PATCH v2 26/27] [media] omap_vout: Switch to use the video/omapfb_dss.h header file Peter Ujfalusi
2016-06-01 8:35 ` [PATCH v2 27/27] drm/omap: Remove the video/omapdss.h and move it's content to local " Peter Ujfalusi
2016-06-02 12:26 ` [PATCH v2 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Tomi Valkeinen
2016-06-02 15:23 ` Tony Lindgren
2016-06-03 10:51 ` Tomi Valkeinen
2016-06-07 5:51 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160601083549.10549-8-peter.ujfalusi@ti.com \
--to=peter.ujfalusi@ti.com \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=jsarha@ti.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=plagnioj@jcrosoft.com \
--cc=robdclark@gmail.com \
--cc=tomi.valkeinen@ti.com \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).