Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5daf2514 authored by Peter Ujfalusi's avatar Peter Ujfalusi
Browse files

omapfb: panel-nec-nl8048hl11: Remove legacy boot support 



The panel is not used by any legacy board files so the legacy (pdata) boot
support can be dropped.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
parent 84d9140d

drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c

+6 −39
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/of_gpio.h>

#include <linux/of_gpio.h>





#include <video/omapdss.h>

#include <video/omapdss.h>

#include <video/omap-panel-data.h>





struct panel_drv_data {

struct panel_drv_data {

	struct omap_dss_device	dssdev;

	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)

static int nec_8048_probe_of(struct spi_device *spi)

{

{

	struct device_node *node = spi->dev.of_node;

	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__);

	dev_dbg(&spi->dev, "%s\n", __func__);





	if (!spi->dev.of_node)

		return -ENODEV;



	spi->mode = SPI_MODE_0;

	spi->mode = SPI_MODE_0;

	spi->bits_per_word = 32;

	spi->bits_per_word = 32;
@@ -315,17 +290,9 @@ static int nec_8048_probe(struct spi_device *spi) 




	ddata->spi = 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);

	r = nec_8048_probe_of(spi);

	if (r)

	if (r)

		return r;

		return r;

	} else {

		return -ENODEV;

	}





	if (gpio_is_valid(ddata->qvga_gpio)) {

	if (gpio_is_valid(ddata->qvga_gpio)) {

		r = devm_gpio_request_one(&spi->dev, ddata->qvga_gpio,

		r = devm_gpio_request_one(&spi->dev, ddata->qvga_gpio,

include/video/omap-panel-data.h

+0 −18
Original line number Original line Diff line number Diff line
@@ -205,22 +205,4 @@ struct panel_tpo_td043mtea1_platform_data { 
	int nreset_gpio;

	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 */
 
#endif /* __OMAP_PANEL_DATA_H */