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

Commit f048e8c1 authored by Peter Ujfalusi's avatar Peter Ujfalusi
Browse files

omapfb: panel-lgphilips-lb035q02: 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 d8647f9e
Loading
Loading
Loading
Loading
+6 −50
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@
#include <linux/gpio.h>

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

static struct omap_video_timings lb035q02_timings = {
	.x_res = 320,
@@ -240,44 +239,6 @@ static struct omap_dss_driver lb035q02_ops = {
	.get_resolution	= omapdss_default_get_resolution,
};

static int lb035q02_probe_pdata(struct spi_device *spi)
{
	const struct panel_lb035q02_platform_data *pdata;
	struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev);
	struct omap_dss_device *dssdev, *in;
	int r;

	pdata = dev_get_platdata(&spi->dev);

	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;

	r = devm_gpio_request_one(&spi->dev, pdata->enable_gpio,
					GPIOF_OUT_INIT_LOW, "panel enable");
	if (r)
		goto err_gpio;

	ddata->enable_gpio = gpio_to_desc(pdata->enable_gpio);

	ddata->backlight_gpio = pdata->backlight_gpio;

	return 0;
err_gpio:
	omap_dss_put_device(ddata->in);
	return r;
}

static int lb035q02_probe_of(struct spi_device *spi)
{
	struct device_node *node = spi->dev.of_node;
@@ -312,6 +273,9 @@ static int lb035q02_panel_spi_probe(struct spi_device *spi)
	struct omap_dss_device *dssdev;
	int r;

	if (!spi->dev.of_node)
		return -ENODEV;

	ddata = devm_kzalloc(&spi->dev, sizeof(*ddata), GFP_KERNEL);
	if (ddata == NULL)
		return -ENOMEM;
@@ -320,17 +284,9 @@ static int lb035q02_panel_spi_probe(struct spi_device *spi)

	ddata->spi = spi;

	if (dev_get_platdata(&spi->dev)) {
		r = lb035q02_probe_pdata(spi);
		if (r)
			return r;
	} else if (spi->dev.of_node) {
	r = lb035q02_probe_of(spi);
	if (r)
		return r;
	} else {
		return -ENODEV;
	}

	if (gpio_is_valid(ddata->backlight_gpio)) {
		r = devm_gpio_request_one(&spi->dev, ddata->backlight_gpio,
+0 −18
Original line number Diff line number Diff line
@@ -147,22 +147,4 @@ struct panel_acx565akm_platform_data {
	int datapairs;
};

/**
 * panel_lb035q02 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
 * @backlight_gpio: gpio to enable/disable the backlight (or -1)
 * @enable_gpio: gpio to enable/disable the panel (or -1)
 */
struct panel_lb035q02_platform_data {
	const char *name;
	const char *source;

	int data_lines;

	int backlight_gpio;
	int enable_gpio;
};

#endif /* __OMAP_PANEL_DATA_H */