|
@@ -201,32 +201,6 @@ static const struct omapdss_hdmi_ops tpd_hdmi_ops = {
|
|
|
.set_hdmi_mode = tpd_set_hdmi_mode,
|
|
|
};
|
|
|
|
|
|
-static int tpd_probe_pdata(struct platform_device *pdev)
|
|
|
-{
|
|
|
- struct panel_drv_data *ddata = platform_get_drvdata(pdev);
|
|
|
- struct encoder_tpd12s015_platform_data *pdata;
|
|
|
- struct omap_dss_device *dssdev, *in;
|
|
|
-
|
|
|
- pdata = dev_get_platdata(&pdev->dev);
|
|
|
-
|
|
|
- ddata->ct_cp_hpd_gpio = pdata->ct_cp_hpd_gpio;
|
|
|
- ddata->ls_oe_gpio = pdata->ls_oe_gpio;
|
|
|
- ddata->hpd_gpio = pdata->hpd_gpio;
|
|
|
-
|
|
|
- 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 tpd_probe_of(struct platform_device *pdev)
|
|
|
{
|
|
|
struct panel_drv_data *ddata = platform_get_drvdata(pdev);
|
|
@@ -282,17 +256,12 @@ static int tpd_probe(struct platform_device *pdev)
|
|
|
|
|
|
platform_set_drvdata(pdev, ddata);
|
|
|
|
|
|
- if (dev_get_platdata(&pdev->dev)) {
|
|
|
- r = tpd_probe_pdata(pdev);
|
|
|
- if (r)
|
|
|
- return r;
|
|
|
- } else if (pdev->dev.of_node) {
|
|
|
- r = tpd_probe_of(pdev);
|
|
|
- if (r)
|
|
|
- return r;
|
|
|
- } else {
|
|
|
+ if (!pdev->dev.of_node)
|
|
|
return -ENODEV;
|
|
|
- }
|
|
|
+
|
|
|
+ r = tpd_probe_of(pdev);
|
|
|
+ if (r)
|
|
|
+ return r;
|
|
|
|
|
|
r = devm_gpio_request_one(&pdev->dev, ddata->ct_cp_hpd_gpio,
|
|
|
GPIOF_OUT_INIT_LOW, "hdmi_ct_cp_hpd");
|