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

Commit 0984097c authored by Peter Ujfalusi's avatar Peter Ujfalusi
Browse files

omapfb: panel-dsi-cm: 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 f048e8c1

drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c

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



#include <video/omapdss.h>

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

#include <video/mipi_display.h>



/* DSI Virtual channel. Hardcoded for now. */
@@ -1127,40 +1126,6 @@ static struct omap_dss_driver dsicm_ops = { 
	.memory_read	= dsicm_memory_read,

};



static int dsicm_probe_pdata(struct platform_device *pdev)

{

	const struct panel_dsicm_platform_data *pdata;

	struct panel_drv_data *ddata = platform_get_drvdata(pdev);

	struct omap_dss_device *dssdev, *in;



	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\n");

		return -EPROBE_DEFER;

	}

	ddata->in = in;



	ddata->reset_gpio = pdata->reset_gpio;



	if (pdata->use_ext_te)

		ddata->ext_te_gpio = pdata->ext_te_gpio;

	else

		ddata->ext_te_gpio = -1;



	ddata->ulps_timeout = pdata->ulps_timeout;



	ddata->use_dsi_backlight = pdata->use_dsi_backlight;



	ddata->pin_config = pdata->pin_config;



	dssdev = &ddata->dssdev;

	dssdev->name = pdata->name;



	return 0;

}



static int dsicm_probe_of(struct platform_device *pdev)

{

	struct device_node *node = pdev->dev.of_node;
@@ -1207,6 +1172,9 @@ static int dsicm_probe(struct platform_device *pdev) 


	dev_dbg(dev, "probe\n");



	if (!pdev->dev.of_node)

		return -ENODEV;



	ddata = devm_kzalloc(dev, sizeof(*ddata), GFP_KERNEL);

	if (!ddata)

		return -ENOMEM;
@@ -1214,17 +1182,9 @@ static int dsicm_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, ddata);

	ddata->pdev = pdev;



	if (dev_get_platdata(dev)) {

		r = dsicm_probe_pdata(pdev);

		if (r)

			return r;

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

	r = dsicm_probe_of(pdev);

	if (r)

		return r;

	} else {

		return -ENODEV;

	}



	ddata->timings.x_res = 864;

	ddata->timings.y_res = 480;

include/video/omap-panel-data.h

+0 −27
Original line number Diff line number Diff line
@@ -104,33 +104,6 @@ struct panel_dpi_platform_data { 
	int enable_gpio;

};



/**

 * panel_dsicm 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)

 * @use_ext_te: use external TE GPIO

 * @ext_te_gpio: external TE GPIO

 * @ulps_timeout: time to wait before entering ULPS, 0 = disabled (ms)

 * @use_dsi_backlight: true if panel uses DSI command to control backlight

 * @pin_config: DSI pin configuration

 */

struct panel_dsicm_platform_data {

	const char *name;

	const char *source;



	int reset_gpio;



	bool use_ext_te;

	int ext_te_gpio;



	unsigned ulps_timeout;



	bool use_dsi_backlight;



	struct omap_dsi_pin_config pin_config;

};



/**

 * panel_acx565akm platform data

 * @name: name for this display entity