aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/sti/sti_hdmi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/sti/sti_hdmi.c')
-rw-r--r--drivers/gpu/drm/sti/sti_hdmi.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
index fed1b5fe4842..192119761c14 100644
--- a/drivers/gpu/drm/sti/sti_hdmi.c
+++ b/drivers/gpu/drm/sti/sti_hdmi.c
@@ -130,8 +130,7 @@ static irqreturn_t hdmi_irq_thread(int irq, void *arg)
130 130
131 /* Hot plug/unplug IRQ */ 131 /* Hot plug/unplug IRQ */
132 if (hdmi->irq_status & HDMI_INT_HOT_PLUG) { 132 if (hdmi->irq_status & HDMI_INT_HOT_PLUG) {
133 /* read gpio to get the status */ 133 hdmi->hpd = readl(hdmi->regs + HDMI_STA) & HDMI_STA_HOT_PLUG;
134 hdmi->hpd = gpio_get_value(hdmi->hpd_gpio);
135 if (hdmi->drm_dev) 134 if (hdmi->drm_dev)
136 drm_helper_hpd_irq_event(hdmi->drm_dev); 135 drm_helper_hpd_irq_event(hdmi->drm_dev);
137 } 136 }
@@ -766,13 +765,7 @@ static int sti_hdmi_probe(struct platform_device *pdev)
766 return PTR_ERR(hdmi->clk_audio); 765 return PTR_ERR(hdmi->clk_audio);
767 } 766 }
768 767
769 hdmi->hpd_gpio = of_get_named_gpio(np, "hdmi,hpd-gpio", 0); 768 hdmi->hpd = readl(hdmi->regs + HDMI_STA) & HDMI_STA_HOT_PLUG;
770 if (hdmi->hpd_gpio < 0) {
771 DRM_ERROR("Failed to get hdmi hpd-gpio\n");
772 return -EIO;
773 }
774
775 hdmi->hpd = gpio_get_value(hdmi->hpd_gpio);
776 769
777 init_waitqueue_head(&hdmi->wait_event); 770 init_waitqueue_head(&hdmi->wait_event);
778 771