OMAPDSS: add hdmi ops to hdmi-connector and tpd12s015

[cascardo/linux.git] / drivers / video / fbdev / omap2 / displays-new / connector-hdmi.c

diff --git a/drivers/video/fbdev/omap2/displays-new/connector-hdmi.c b/drivers/video/fbdev/omap2/displays-new/connector-hdmi.c
index 29ed21b..131c6e2 100644 (file)
--- a/drivers/video/fbdev/omap2/displays-new/connector-hdmi.c
+++ b/drivers/video/fbdev/omap2/displays-new/connector-hdmi.c
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/of.h>
+#include <linux/of_gpio.h>
 
 #include <drm/drm_edid.h>
 
@@ -43,6 +44,8 @@ struct panel_drv_data {
        struct device *dev;
 
        struct omap_video_timings timings;
+
+       int hpd_gpio;
 };
 
 #define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev)
@@ -161,7 +164,10 @@ 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;
 
-       return in->ops.hdmi->detect(in);
+       if (gpio_is_valid(ddata->hpd_gpio))
+               return gpio_get_value_cansleep(ddata->hpd_gpio);
+       else
+               return in->ops.hdmi->detect(in);
 }
 
 static int hdmic_audio_enable(struct omap_dss_device *dssdev)
@@ -256,6 +262,23 @@ static int hdmic_audio_config(struct omap_dss_device *dssdev,
        return 0;
 }
 
+static int hdmic_set_hdmi_mode(struct omap_dss_device *dssdev, bool hdmi_mode)
+{
+       struct panel_drv_data *ddata = to_panel_data(dssdev);
+       struct omap_dss_device *in = ddata->in;
+
+       return in->ops.hdmi->set_hdmi_mode(in, hdmi_mode);
+}
+
+static int hdmic_set_infoframe(struct omap_dss_device *dssdev,
+               const struct hdmi_avi_infoframe *avi)
+{
+       struct panel_drv_data *ddata = to_panel_data(dssdev);
+       struct omap_dss_device *in = ddata->in;
+
+       return in->ops.hdmi->set_infoframe(in, avi);
+}
+
 static struct omap_dss_driver hdmic_driver = {
        .connect                = hdmic_connect,
        .disconnect             = hdmic_disconnect,
@@ -271,6 +294,8 @@ static struct omap_dss_driver hdmic_driver = {
 
        .read_edid              = hdmic_read_edid,
        .detect                 = hdmic_detect,
+       .set_hdmi_mode          = hdmic_set_hdmi_mode,
+       .set_hdmi_infoframe     = hdmic_set_infoframe,
 
        .audio_enable           = hdmic_audio_enable,
        .audio_disable          = hdmic_audio_disable,
@@ -288,6 +313,8 @@ static int hdmic_probe_pdata(struct platform_device *pdev)
 
        pdata = dev_get_platdata(&pdev->dev);
 
+       ddata->hpd_gpio = -ENODEV;
+
        in = omap_dss_find_output(pdata->source);
        if (in == NULL) {
                dev_err(&pdev->dev, "Failed to find video source\n");
@@ -307,6 +334,14 @@ 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)) {
@@ -344,6 +379,13 @@ static int hdmic_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
+       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;
+       }
+
        ddata->timings = hdmic_default_timings;
 
        dssdev = &ddata->dssdev;