提交 5996a5ae 编写于 作者: P Peter Ujfalusi

omapfb: connector-dvi: 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: NPeter Ujfalusi <peter.ujfalusi@ti.com>
上级 b0417013
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include <drm/drm_edid.h> #include <drm/drm_edid.h>
#include <video/omapdss.h> #include <video/omapdss.h>
#include <video/omap-panel-data.h>
static const struct omap_video_timings dvic_default_timings = { static const struct omap_video_timings dvic_default_timings = {
.x_res = 640, .x_res = 640,
...@@ -236,46 +235,6 @@ static struct omap_dss_driver dvic_driver = { ...@@ -236,46 +235,6 @@ static struct omap_dss_driver dvic_driver = {
.detect = dvic_detect, .detect = dvic_detect,
}; };
static int dvic_probe_pdata(struct platform_device *pdev)
{
struct panel_drv_data *ddata = platform_get_drvdata(pdev);
struct connector_dvi_platform_data *pdata;
struct omap_dss_device *in, *dssdev;
int i2c_bus_num;
pdata = dev_get_platdata(&pdev->dev);
i2c_bus_num = pdata->i2c_bus_num;
if (i2c_bus_num != -1) {
struct i2c_adapter *adapter;
adapter = i2c_get_adapter(i2c_bus_num);
if (!adapter) {
dev_err(&pdev->dev,
"Failed to get I2C adapter, bus %d\n",
i2c_bus_num);
return -EPROBE_DEFER;
}
ddata->i2c_adapter = adapter;
}
in = omap_dss_find_output(pdata->source);
if (in == NULL) {
i2c_put_adapter(ddata->i2c_adapter);
dev_err(&pdev->dev, "Failed to find video source\n");
return -EPROBE_DEFER;
}
ddata->in = in;
dssdev = &ddata->dssdev;
dssdev->name = pdata->name;
return 0;
}
static int dvic_probe_of(struct platform_device *pdev) static int dvic_probe_of(struct platform_device *pdev)
{ {
struct panel_drv_data *ddata = platform_get_drvdata(pdev); struct panel_drv_data *ddata = platform_get_drvdata(pdev);
...@@ -313,23 +272,18 @@ static int dvic_probe(struct platform_device *pdev) ...@@ -313,23 +272,18 @@ static int dvic_probe(struct platform_device *pdev)
struct omap_dss_device *dssdev; struct omap_dss_device *dssdev;
int r; int r;
if (!pdev->dev.of_node)
return -ENODEV;
ddata = devm_kzalloc(&pdev->dev, sizeof(*ddata), GFP_KERNEL); ddata = devm_kzalloc(&pdev->dev, sizeof(*ddata), GFP_KERNEL);
if (!ddata) if (!ddata)
return -ENOMEM; return -ENOMEM;
platform_set_drvdata(pdev, ddata); platform_set_drvdata(pdev, ddata);
if (dev_get_platdata(&pdev->dev)) { r = dvic_probe_of(pdev);
r = dvic_probe_pdata(pdev); if (r)
if (r) return r;
return r;
} else if (pdev->dev.of_node) {
r = dvic_probe_of(pdev);
if (r)
return r;
} else {
return -ENODEV;
}
ddata->timings = dvic_default_timings; ddata->timings = dvic_default_timings;
......
...@@ -46,18 +46,6 @@ struct encoder_tfp410_platform_data { ...@@ -46,18 +46,6 @@ struct encoder_tfp410_platform_data {
}; };
/**
* connector_dvi platform data
* @name: name for this display entity
* @source: name of the display entity used as a video source
* @i2c_bus_num: i2c bus number to be used for reading EDID
*/
struct connector_dvi_platform_data {
const char *name;
const char *source;
int i2c_bus_num;
};
/** /**
* connector_atv platform data * connector_atv platform data
* @name: name for this display entity * @name: name for this display entity
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册