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

fbdev: omapfb: connector-analog-tv: remove support for platform data 



There are no users of connector_atv_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 b7ec002c

drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c

+8 −52
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <linux/of.h>



#include <video/omapfb_dss.h>

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



struct panel_drv_data {

	struct omap_dss_device dssdev;
@@ -178,53 +177,15 @@ static struct omap_dss_driver tvc_driver = { 
	.set_wss		= tvc_set_wss,

};



static int tvc_probe_pdata(struct platform_device *pdev)

{

	struct panel_drv_data *ddata = platform_get_drvdata(pdev);

	struct connector_atv_platform_data *pdata;

	struct omap_dss_device *in, *dssdev;



	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->invert_polarity = pdata->invert_polarity;



	dssdev = &ddata->dssdev;

	dssdev->name = pdata->name;



	return 0;

}



static int tvc_probe_of(struct platform_device *pdev)

{

	struct panel_drv_data *ddata = platform_get_drvdata(pdev);

	struct device_node *node = pdev->dev.of_node;

	struct omap_dss_device *in;



	in = omapdss_of_find_source_for_first_ep(node);

	if (IS_ERR(in)) {

		dev_err(&pdev->dev, "failed to find video source\n");

		return PTR_ERR(in);

	}



	ddata->in = in;



	return 0;

}



static int tvc_probe(struct platform_device *pdev)

{

	struct panel_drv_data *ddata;

	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)

		return -ENOMEM;
@@ -232,16 +193,11 @@ static int tvc_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, ddata);

	ddata->dev = &pdev->dev;



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

		r = tvc_probe_pdata(pdev);

		if (r)

			return r;

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

		r = tvc_probe_of(pdev);

		if (r)

	ddata->in = omapdss_of_find_source_for_first_ep(pdev->dev.of_node);

	r = PTR_ERR_OR_ZERO(ddata->in);

	if (r) {

		dev_err(&pdev->dev, "failed to find video source\n");

		return r;

	} else {

		return -ENODEV;

	}



	ddata->timings = tvc_pal_timings;

include/video/omap-panel-data.h

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Header containing platform_data structs for omap panels

 *

 * Copyright (C) 2013 Texas Instruments

 * Author: Tomi Valkeinen <tomi.valkeinen@ti.com>

 *	   Archit Taneja <archit@ti.com>

 *

 * Copyright (C) 2011 Texas Instruments

 * Author: Mayuresh Janorkar <mayur@ti.com>

 *

 * Copyright (C) 2010 Canonical Ltd.

 * Author: Bryan Wu <bryan.wu@canonical.com>

 */



#ifndef __OMAP_PANEL_DATA_H

#define __OMAP_PANEL_DATA_H



#include <video/display_timing.h>



/**

 * connector_atv platform data

 * @name: name for this display entity

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

 * @invert_polarity: invert signal polarity

 */

struct connector_atv_platform_data {

	const char *name;

	const char *source;



	bool invert_polarity;

};



#endif /* __OMAP_PANEL_DATA_H */