Commit b7ec002c authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Helge Deller
Browse files

fbdev: omapfb: panel-dpi: remove support for platform data 



There are no users of panel_dpi_platform_data in the mainline
kernel so support for it can be removed from the panel driver.

Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 39630e0f

drivers/video/fbdev/omap2/omapfb/displays/panel-dpi.c

+7 −76
Original line number Diff line number Diff line
@@ -6,15 +6,13 @@ 
 * Author: Tomi Valkeinen <tomi.valkeinen@ti.com>

 */



#include <linux/gpio.h>

#include <linux/gpio/consumer.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/of.h>

#include <linux/of_gpio.h>



#include <video/omapfb_dss.h>

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

#include <video/of_display_timing.h>



struct panel_drv_data {
@@ -25,9 +23,6 @@ struct panel_drv_data { 


	struct omap_video_timings videomode;



	/* used for non-DT boot, to be removed */

	int backlight_gpio;



	struct gpio_desc *enable_gpio;

};
@@ -77,9 +72,6 @@ static int panel_dpi_enable(struct omap_dss_device *dssdev) 


	gpiod_set_value_cansleep(ddata->enable_gpio, 1);



	if (gpio_is_valid(ddata->backlight_gpio))

		gpio_set_value_cansleep(ddata->backlight_gpio, 1);



	dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;



	return 0;
@@ -93,9 +85,6 @@ static void panel_dpi_disable(struct omap_dss_device *dssdev) 
	if (!omapdss_device_is_enabled(dssdev))

		return;



	if (gpio_is_valid(ddata->backlight_gpio))

		gpio_set_value_cansleep(ddata->backlight_gpio, 0);



	gpiod_set_value_cansleep(ddata->enable_gpio, 0);



	in->ops.dpi->disable(in);
@@ -146,49 +135,6 @@ static struct omap_dss_driver panel_dpi_ops = { 
	.get_resolution	= omapdss_default_get_resolution,

};



static int panel_dpi_probe_pdata(struct platform_device *pdev)

{

	const struct panel_dpi_platform_data *pdata;

	struct panel_drv_data *ddata = platform_get_drvdata(pdev);

	struct omap_dss_device *dssdev, *in;

	struct videomode vm;

	int r;



	pdata = dev_get_platdata(&pdev->dev);



	in = omap_dss_find_output(pdata->source);

	if (in == NULL) {

		dev_err(&pdev->dev, "failed to find video source '%s'\n",

				pdata->source);

		return -EPROBE_DEFER;

	}



	ddata->in = in;



	ddata->data_lines = pdata->data_lines;



	videomode_from_timing(pdata->display_timing, &vm);

	videomode_to_omap_video_timings(&vm, &ddata->videomode);



	dssdev = &ddata->dssdev;

	dssdev->name = pdata->name;



	r = devm_gpio_request_one(&pdev->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 panel_dpi_probe_of(struct platform_device *pdev)

{

	struct panel_drv_data *ddata = platform_get_drvdata(pdev);
@@ -205,8 +151,6 @@ static int panel_dpi_probe_of(struct platform_device *pdev) 


	ddata->enable_gpio = gpio;



	ddata->backlight_gpio = -ENOENT;



	r = of_get_display_timing(node, "panel-timing", &timing);

	if (r) {

		dev_err(&pdev->dev, "failed to get video timing\n");
@@ -233,30 +177,18 @@ static int panel_dpi_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 == NULL)

		return -ENOMEM;



	platform_set_drvdata(pdev, ddata);



	if (dev_get_platdata(&pdev->dev)) {

		r = panel_dpi_probe_pdata(pdev);

		if (r)

			return r;

	} else if (pdev->dev.of_node) {

	r = panel_dpi_probe_of(pdev);

	if (r)

		return r;

	} else {

		return -ENODEV;

	}



	if (gpio_is_valid(ddata->backlight_gpio)) {

		r = devm_gpio_request_one(&pdev->dev, ddata->backlight_gpio,

				GPIOF_OUT_INIT_LOW, "panel backlight");

		if (r)

			goto err_gpio;

	}



	dssdev = &ddata->dssdev;

	dssdev->dev = &pdev->dev;
@@ -275,7 +207,6 @@ static int panel_dpi_probe(struct platform_device *pdev) 
	return 0;



err_reg:

err_gpio:

	omap_dss_put_device(ddata->in);

	return r;

}

include/video/omap-panel-data.h

+0 −21
Original line number Diff line number Diff line
@@ -31,25 +31,4 @@ struct connector_atv_platform_data { 
	bool invert_polarity;

};



/**

 * panel_dpi 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

 * @display_timing: timings for this panel

 * @backlight_gpio: gpio to enable/disable the backlight (or -1)

 * @enable_gpio: gpio to enable/disable the panel (or -1)

 */

struct panel_dpi_platform_data {

	const char *name;

	const char *source;



	int data_lines;



	const struct display_timing *display_timing;



	int backlight_gpio;

	int enable_gpio;

};



#endif /* __OMAP_PANEL_DATA_H */