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 v3 06/27] omapfb: panel-nec-nl8048hl11: Remove legacy boot support
Date: Fri, 3 Jun 2016 14:03:08 +0300 [thread overview]
Message-ID: <20160603110329.9953-7-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <20160603110329.9953-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>
---
.../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
next prev parent reply other threads:[~2016-06-03 11:12 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-03 11:03 [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
2016-06-03 11:03 ` [PATCH v3 01/27] ARM: OMAP: rx51-video: Do not set TV connector_type Peter Ujfalusi
2016-06-03 11:03 ` [PATCH v3 02/27] ARM/video: omap2: Move omap_display_init declaration to mach-omap2/display.h Peter Ujfalusi
2016-06-03 11:03 ` [PATCH v3 03/27] video/platform_data: omapdss: Create new header file for platform data Peter Ujfalusi
2016-06-03 11:03 ` [PATCH v3 04/27] ARM: OMAP2: Use the platform_data header for omapdss Peter Ujfalusi
2016-06-03 11:03 ` [PATCH v3 05/27] omapfb: panel-tpo-td028ttec1: Remove legacy boot support Peter Ujfalusi
2016-06-03 11:03 ` Peter Ujfalusi [this message]
2016-06-03 11:03 ` [PATCH v3 07/27] omapfb: panel-tpo-td043mtea1: " Peter Ujfalusi
2016-06-03 11:03 ` [PATCH v3 08/27] omapfb: panel-sharp-ls037v7dw01: " Peter Ujfalusi
2016-06-03 11:03 ` [PATCH v3 09/27] omapfb: panel-lgphilips-lb035q02: " Peter Ujfalusi
2016-06-03 11:03 ` [PATCH v3 10/27] omapfb: panel-dsi-cm: " Peter Ujfalusi
2016-06-03 11:03 ` [PATCH v3 11/27] omapfb: connector-hdmi: " Peter Ujfalusi
2016-06-03 11:03 ` [PATCH v3 12/27] omapfb: connector-dvi: " Peter Ujfalusi
2016-06-03 11:03 ` [PATCH v3 13/27] omapfb: encoder-tfp410: " Peter Ujfalusi
2016-06-03 11:03 ` [PATCH v3 14/27] omapfb: encoder-tpd12s015: No need to include video/omap-panle-data.h Peter Ujfalusi
2016-06-03 11:03 ` [PATCH v3 15/27] drm/omap: displays: Do not include video/omap-panel-data.h if not needed Peter Ujfalusi
2016-06-03 11:03 ` [PATCH v3 16/27] omapdss: omap-panel-data.h: Remove struct omap_dss_device declaration Peter Ujfalusi
2016-06-03 11:03 ` [PATCH v3 17/27] drm/omap: connector-analog-tv: Support only Composite type in legacy boot Peter Ujfalusi
2016-06-03 11:03 ` [PATCH v3 18/27] omapfb: " Peter Ujfalusi
2016-06-03 11:03 ` [PATCH v3 19/27] omapdss: omap-panel-data.h: Remove connector_type from atv pdata Peter Ujfalusi
2016-06-03 11:03 ` [PATCH v3 20/27] drm/omap: Remove reference to pdata->default_device Peter Ujfalusi
2016-06-03 11:03 ` [PATCH v3 21/27] omapfb: " Peter Ujfalusi
2016-06-03 11:03 ` [PATCH v3 22/27] platform_data: omapdss: Remove unused members from omap_dss_board_info Peter Ujfalusi
2016-06-03 11:03 ` [PATCH v3 23/27] omapdss: hdmi audio: Make header file independent of video/omapdss.h Peter Ujfalusi
2016-06-03 11:03 ` [PATCH v3 24/27] drm/omap: Do not include video/omapdss.h directly in drivers Peter Ujfalusi
2016-06-03 11:03 ` [PATCH v3 25/27] omapfb: Create new header file for omapfb DSS implementation Peter Ujfalusi
2016-06-03 11:03 ` [PATCH v3 26/27] [media] omap_vout: Switch to use the video/omapfb_dss.h header file Peter Ujfalusi
2016-06-03 11:03 ` [PATCH v3 27/27] drm/omap: Remove the video/omapdss.h and move it's content to local " Peter Ujfalusi
2016-06-03 13:08 ` [PATCH v3 00/27] fb/drm: omapdss: Clean up the headers and separate the two stack Peter Ujfalusi
2016-06-07 5:58 ` Tony Lindgren
-- strict thread matches above, loose matches on Subject: below --
2016-06-03 10:52 Peter Ujfalusi
2016-06-03 10:53 ` [PATCH v3 06/27] omapfb: panel-nec-nl8048hl11: Remove legacy boot support Peter Ujfalusi
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=20160603110329.9953-7-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).