diff options
| author | Andy Green <andy.green@linaro.org> | 2012-06-21 14:37:34 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2012-06-21 14:37:34 +0800 |
| commit | 18992f574a4d10c5dea91bc79a923cbda89dfbbc (patch) | |
| tree | 3a3555fb91fd89193fd8f1f1702385ae1472f997 | |
| parent | dfcbc654c2c4783e6a7dc771090973abe37d3e0b (diff) | |
omapdss omap5 also use permanent hpd enable on omap5
Signed-off-by: Andy Green <andy.green@linaro.org>
| -rw-r--r-- | arch/arm/mach-omap2/board-omap5evm.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-omap2/board-omap5evm.c b/arch/arm/mach-omap2/board-omap5evm.c index 8f4cb5b7915..830c25a97b9 100644 --- a/arch/arm/mach-omap2/board-omap5evm.c +++ b/arch/arm/mach-omap2/board-omap5evm.c @@ -1399,6 +1399,12 @@ static void omap5evm_hdmi_init(void) if (r) pr_err("%s: Could not get HDMI\n", __func__); + /* Requesting HDMI HPD_EN GPIO and enable it, at bootup */ + r = gpio_request_one(HDMI_HPD_EN_GPIO, + GPIOF_OUT_INIT_HIGH, "HDMI_HPD_EN"); + if (r) + pr_err("Failed to get HDMI HPD EN GPIO\n"); + /* Need to configure HPD as a gpio in mux */ omap_hdmi_init(0); } @@ -1458,18 +1464,14 @@ static int omap5evm_panel_enable_hdmi(struct omap_dss_device *dssdev) pr_info("omap5evm_panel_enable_hdmi\n"); - /* Requesting HDMI OE GPIO and enable it, at bootup */ + r = gpio_request_one(HDMI_HPD_EN_GPIO, + GPIOF_OUT_INIT_HIGH, "HDMI_HPD_EN"); + r = gpio_request_one(HDMI_OE_GPIO, GPIOF_OUT_INIT_HIGH, "HDMI_OE"); if (r) pr_err("Failed to get HDMI OE GPIO\n"); - /* Requesting HDMI HPD_EN GPIO and enable it, at bootup */ - r = gpio_request_one(HDMI_HPD_EN_GPIO, - GPIOF_OUT_INIT_HIGH, "HDMI_HPD_EN"); - if (r) - pr_err("Failed to get HDMI HPD EN GPIO\n"); - return 0; } @@ -1477,10 +1479,8 @@ static void omap5evm_panel_disable_hdmi(struct omap_dss_device *dssdev) { pr_info("omap5evm_panel_disable_hdmi\n"); - gpio_set_value_cansleep(HDMI_HPD_EN_GPIO, 0); gpio_set_value_cansleep(HDMI_OE_GPIO, 0); - gpio_free(HDMI_HPD_EN_GPIO); gpio_free(HDMI_OE_GPIO); } |