fbdev: omapfb: connector-hdmi: switch to using gpiod API

Switch the driver from legacy gpio API that is deprecated to the newer
gpiod API that respects line polarities described in ACPI/DT.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Helge Deller <deller@gmx.de>

diff --git a/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c b/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c
index 670b9c6eb5a9c13294fc29fbb5063378414bf871..8f9ff9fb4ca4c309574d4400f70d199cad23b73c 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c
+++ b/drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c
@@ -6,11 +6,12 @@
  * Author: Tomi Valkeinen <tomi.valkeinen@ti.com>
  */
 
+#include <linux/err.h>
+#include <linux/gpio/consumer.h>
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/of.h>
-#include <linux/of_gpio.h>
 
 #include <drm/drm_edid.h>
 
@@ -41,7 +42,7 @@ struct panel_drv_data {
 
        struct omap_video_timings timings;
 
-       int hpd_gpio;
+       struct gpio_desc *hpd_gpio;
 };
 
 #define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev)
@@ -155,8 +156,8 @@ static bool hdmic_detect(struct omap_dss_device *dssdev)
        struct panel_drv_data *ddata = to_panel_data(dssdev);
        struct omap_dss_device *in = ddata->in;
 
-       if (gpio_is_valid(ddata->hpd_gpio))
-               return gpio_get_value_cansleep(ddata->hpd_gpio);
+       if (ddata->hpd_gpio)
+               return gpiod_get_value_cansleep(ddata->hpd_gpio);
        else
                return in->ops.hdmi->detect(in);
 }
@@ -197,31 +198,6 @@ static struct omap_dss_driver hdmic_driver = {
        .set_hdmi_infoframe     = hdmic_set_infoframe,
 };
 
-static int hdmic_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;
-       int gpio;
-
-       /* HPD GPIO */
-       gpio = of_get_named_gpio(node, "hpd-gpios", 0);
-       if (gpio_is_valid(gpio))
-               ddata->hpd_gpio = gpio;
-       else
-               ddata->hpd_gpio = -ENODEV;
-
-       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 hdmic_probe(struct platform_device *pdev)
 {
        struct panel_drv_data *ddata;
@@ -238,15 +214,18 @@ static int hdmic_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, ddata);
        ddata->dev = &pdev->dev;
 
-       r = hdmic_probe_of(pdev);
+       ddata->hpd_gpio = devm_gpiod_get_optional(&pdev->dev, "hpd", GPIOD_IN);
+       r = PTR_ERR_OR_ZERO(ddata->hpd_gpio);
        if (r)
                return r;
 
-       if (gpio_is_valid(ddata->hpd_gpio)) {
-               r = devm_gpio_request_one(&pdev->dev, ddata->hpd_gpio,
-                               GPIOF_DIR_IN, "hdmi_hpd");
-               if (r)
-                       goto err_reg;
+       gpiod_set_consumer_name(ddata->hpd_gpio, "hdmi_hpd");
+
+       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;
        }
 
        ddata->timings = hdmic_default_timings;