|
@@ -166,32 +166,6 @@ static const struct omapdss_dvi_ops tfp410_dvi_ops = {
|
|
|
.get_timings = tfp410_get_timings,
|
|
|
};
|
|
|
|
|
|
-static int tfp410_probe_pdata(struct platform_device *pdev)
|
|
|
-{
|
|
|
- struct panel_drv_data *ddata = platform_get_drvdata(pdev);
|
|
|
- struct encoder_tfp410_platform_data *pdata;
|
|
|
- struct omap_dss_device *dssdev, *in;
|
|
|
-
|
|
|
- pdata = dev_get_platdata(&pdev->dev);
|
|
|
-
|
|
|
- ddata->pd_gpio = pdata->power_down_gpio;
|
|
|
-
|
|
|
- ddata->data_lines = pdata->data_lines;
|
|
|
-
|
|
|
- in = omap_dss_find_output(pdata->source);
|
|
|
- if (in == NULL) {
|
|
|
- dev_err(&pdev->dev, "Failed to find video source\n");
|
|
|
- return -ENODEV;
|
|
|
- }
|
|
|
-
|
|
|
- ddata->in = in;
|
|
|
-
|
|
|
- dssdev = &ddata->dssdev;
|
|
|
- dssdev->name = pdata->name;
|
|
|
-
|
|
|
- return 0;
|
|
|
-}
|
|
|
-
|
|
|
static int tfp410_probe_of(struct platform_device *pdev)
|
|
|
{
|
|
|
struct panel_drv_data *ddata = platform_get_drvdata(pdev);
|
|
@@ -231,17 +205,12 @@ static int tfp410_probe(struct platform_device *pdev)
|
|
|
|
|
|
platform_set_drvdata(pdev, ddata);
|
|
|
|
|
|
- if (dev_get_platdata(&pdev->dev)) {
|
|
|
- r = tfp410_probe_pdata(pdev);
|
|
|
- if (r)
|
|
|
- return r;
|
|
|
- } else if (pdev->dev.of_node) {
|
|
|
- r = tfp410_probe_of(pdev);
|
|
|
- if (r)
|
|
|
- return r;
|
|
|
- } else {
|
|
|
+ if (!pdev->dev.of_node)
|
|
|
return -ENODEV;
|
|
|
- }
|
|
|
+
|
|
|
+ r = tfp410_probe_of(pdev);
|
|
|
+ if (r)
|
|
|
+ return r;
|
|
|
|
|
|
if (gpio_is_valid(ddata->pd_gpio)) {
|
|
|
r = devm_gpio_request_one(&pdev->dev, ddata->pd_gpio,
|