summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Gilling <konkers@android.com>2011-02-28 13:25:44 -0800
committerVarun Colbert <vcolbert@nvidia.com>2011-03-29 15:43:09 -0700
commit52d731b8029b74d7d003cf602408c7ff1a6ada31 (patch)
tree5960d681d79e2f09bd5ad604c5ad86b37e67ee29
parent17de002a0ff09138c9db244cb200380ba38f4033 (diff)
video: tegra: hdmi: enable wakeup on hotplugtegra-11.2.3
Fixed bug 801542 Change-Id: I6ae1edf2a1d576a6f93ed483284e7f129aabc58c Signed-off-by: Erik Gilling <konkers@android.com> (cherry picked from commit b8fcb1733b0c5e6ea92c76fdb049e7b2fa2b9290) Reviewed-on: http://git-master/r/24607 Tested-by: Gaurav Sarode <gsarode@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Reviewed-by: Jessica Liao <jeliao@nvidia.com>
-rw-r--r--drivers/video/tegra/dc/hdmi.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c
index 44d15b8f5686..6c06ce540bf6 100644
--- a/drivers/video/tegra/dc/hdmi.c
+++ b/drivers/video/tegra/dc/hdmi.c
@@ -638,6 +638,7 @@ static int tegra_dc_hdmi_init(struct tegra_dc *dc)
err = -EBUSY;
goto err_put_clock;
}
+ enable_irq_wake(gpio_to_irq(dc->out->hotplug_gpio));
hdmi->edid = tegra_edid_create(dc->out->dcc_bus);
if (IS_ERR_OR_NULL(hdmi->edid)) {
@@ -686,6 +687,7 @@ static int tegra_dc_hdmi_init(struct tegra_dc *dc)
err_edid_destroy:
tegra_edid_destroy(hdmi->edid);
err_free_irq:
+ disable_irq_wake(gpio_to_irq(dc->out->hotplug_gpio));
free_irq(gpio_to_irq(dc->out->hotplug_gpio), dc);
err_put_clock:
if (!IS_ERR_OR_NULL(disp2_clk))
@@ -707,6 +709,7 @@ static void tegra_dc_hdmi_destroy(struct tegra_dc *dc)
{
struct tegra_dc_hdmi_data *hdmi = tegra_dc_get_outdata(dc);
+ disable_irq_wake(gpio_to_irq(dc->out->hotplug_gpio));
free_irq(gpio_to_irq(dc->out->hotplug_gpio), dc);
cancel_delayed_work_sync(&hdmi->work);
switch_dev_unregister(&hdmi->hpd_switch);