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

Commit bf31ce72 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

drm/omap: panel-dpi: remove non-DT support 



Non-DT booting is no longer supported, so remove legacy code.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
parent 9d24159a

drivers/gpu/drm/omapdrm/displays/panel-dpi.c

+3 −73
Original line number Diff line number Diff line
@@ -14,11 +14,9 @@ 
#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/of.h>

#include <linux/of_gpio.h>

#include <linux/regulator/consumer.h>

#include <linux/backlight.h>



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

#include <video/of_display_timing.h>



#include "../dss/omapdss.h"
@@ -33,9 +31,6 @@ struct panel_drv_data { 


	struct backlight_device *backlight;



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

	int backlight_gpio;



	struct gpio_desc *enable_gpio;

	struct regulator *vcc_supply;

};
@@ -97,9 +92,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);



	if (ddata->backlight) {

		ddata->backlight->props.power = FB_BLANK_UNBLANK;

		backlight_update_status(ddata->backlight);
@@ -118,9 +110,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);



	if (ddata->backlight) {

		ddata->backlight->props.power = FB_BLANK_POWERDOWN;

		backlight_update_status(ddata->backlight);
@@ -177,47 +166,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;

	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, &ddata->vm);



	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);
@@ -248,8 +196,6 @@ static int panel_dpi_probe_of(struct platform_device *pdev) 
	if (IS_ERR(ddata->vcc_supply))

		return PTR_ERR(ddata->vcc_supply);



	ddata->backlight_gpio = -ENOENT;



	bl_node = of_parse_phandle(node, "backlight", 0);

	if (bl_node) {

		ddata->backlight = of_find_backlight_by_node(bl_node);
@@ -297,24 +243,9 @@ static int panel_dpi_probe(struct platform_device *pdev) 


	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;
@@ -333,7 +264,6 @@ static int panel_dpi_probe(struct platform_device *pdev) 
	return 0;



err_reg:

err_gpio:

	omap_dss_put_device(ddata->in);

	return r;

}