summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Clark <rob@ti.com>2012-02-20 15:03:36 -0600
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-02-23 10:29:08 +0200
commitca888a7958b3d808e4efd08ceff88913f4212c69 (patch)
tree8278e0f84dcb2c1313a5f0196346dc867a63e60e
parenta247ce78ca3fa041f3e6b1187c4ae96c7016e83a (diff)
downloadblackbird-op-linux-ca888a7958b3d808e4efd08ceff88913f4212c69.tar.gz
blackbird-op-linux-ca888a7958b3d808e4efd08ceff88913f4212c69.zip
OMAPDSS: HDMI: hot plug detect fix
The "OMAPDSS: HDMI: PHY burnout fix" commit switched the HDMI driver over to using a GPIO for plug detect. Unfortunately the ->detect() method was not also updated, causing HDMI to no longer work for the omapdrm driver (because it would actually check if a connection was detected before attempting to enable display). Signed-off-by: Rob Clark <rob@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r--drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
index 2d72334ca3da..6847a478b459 100644
--- a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
+++ b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
@@ -479,14 +479,7 @@ int ti_hdmi_4xxx_read_edid(struct hdmi_ip_data *ip_data,
bool ti_hdmi_4xxx_detect(struct hdmi_ip_data *ip_data)
{
- int r;
-
- void __iomem *base = hdmi_core_sys_base(ip_data);
-
- /* HPD */
- r = REG_GET(base, HDMI_CORE_SYS_SYS_STAT, 1, 1);
-
- return r == 1;
+ return gpio_get_value(ip_data->hpd_gpio);
}
static void hdmi_core_init(struct hdmi_core_video_config *video_cfg,
OpenPOWER on IntegriCloud