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

fbdev: omapfb: panel-sony-acx565akm: remove support for platform data 



There are no users of panel_acx565akm_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 257030d4

drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c

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



#include <video/omapfb_dss.h>

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



#define MIPID_CMD_READ_DISP_ID		0x04

#define MIPID_CMD_READ_RED		0x06
@@ -688,32 +687,6 @@ static struct omap_dss_driver acx565akm_ops = { 
	.get_resolution	= omapdss_default_get_resolution,

};



static int acx565akm_probe_pdata(struct spi_device *spi)

{

	const struct panel_acx565akm_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->reset_gpio = pdata->reset_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->datapairs = pdata->datapairs;



	dssdev = &ddata->dssdev;

	dssdev->name = pdata->name;



	return 0;

}



static int acx565akm_probe_of(struct spi_device *spi)

{

	struct panel_drv_data *ddata = dev_get_drvdata(&spi->dev);
@@ -741,6 +714,9 @@ static int acx565akm_probe(struct spi_device *spi) 


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



	if (!spi->dev.of_node)

		return -ENODEV;



	spi->mode = SPI_MODE_3;



	ddata = devm_kzalloc(&spi->dev, sizeof(*ddata), GFP_KERNEL);
@@ -753,18 +729,9 @@ static int acx565akm_probe(struct spi_device *spi) 


	mutex_init(&ddata->mutex);



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

		r = acx565akm_probe_pdata(spi);

		if (r)

			return r;

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

	r = acx565akm_probe_of(spi);

	if (r)

		return r;

	} else {

		dev_err(&spi->dev, "platform data missing!\n");

		return -ENODEV;

	}



	if (gpio_is_valid(ddata->reset_gpio)) {

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

include/video/omap-panel-data.h

+0 −16
Original line number Diff line number Diff line
@@ -52,20 +52,4 @@ struct panel_dpi_platform_data { 
	int enable_gpio;

};



/**

 * panel_acx565akm platform data

 * @name: name for this display entity

 * @source: name of the display entity used as a video source

 * @reset_gpio: gpio to reset the panel (or -1)

 * @datapairs: number of SDI datapairs

 */

struct panel_acx565akm_platform_data {

	const char *name;

	const char *source;



	int reset_gpio;



	int datapairs;

};



#endif /* __OMAP_PANEL_DATA_H */