From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: stable@vger.kernel.org
Cc: linux-fbdev@vger.kernel.org, linux-omap@vger.kernel.org,
Rob Clark <rob@ti.com>, Tomi Valkeinen <tomi.valkeinen@ti.com>
Subject: [PATCH 7/7] OMAPDSS: HDMI: hot plug detect fix
Date: Thu, 01 Mar 2012 12:26:35 +0000 [thread overview]
Message-ID: <1330604795-29156-8-git-send-email-tomi.valkeinen@ti.com> (raw)
In-Reply-To: <1330604795-29156-1-git-send-email-tomi.valkeinen@ti.com>
From: Rob Clark <rob@ti.com>
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>
---
drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c | 9 +--------
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 3683404..aad48a1 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,
--
1.7.4.1
next prev parent reply other threads:[~2012-03-01 12:26 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-01 12:26 [PATCH 0/7] OMAPDSS: HDMI PHY burnout fix for 3.2 stable Tomi Valkeinen
2012-03-01 12:26 ` [PATCH 1/7] OMAP: 4430SDP/Panda: use gpio_free_array to free HDMI gpios Tomi Valkeinen
2012-03-01 12:26 ` [PATCH 2/7] OMAP: 4430SDP/Panda: rename HPD GPIO to CT_CP_HPD Tomi Valkeinen
2012-03-01 12:26 ` [PATCH 3/7] OMAPDSS: remove wrong HDMI HPD muxing Tomi Valkeinen
2012-03-01 12:26 ` [PATCH 4/7] OMAP: 4430SDP/Panda: setup HDMI GPIO muxes Tomi Valkeinen
2012-03-01 12:26 ` [PATCH 5/7] OMAP: 4430SDP/Panda: add HDMI HPD gpio Tomi Valkeinen
2012-03-01 12:26 ` [PATCH 6/7] OMAPDSS: HDMI: PHY burnout fix Tomi Valkeinen
2012-03-01 12:26 ` Tomi Valkeinen [this message]
2012-03-07 20:01 ` [PATCH 7/7] OMAPDSS: HDMI: hot plug detect fix Greg KH
2012-03-08 7:35 ` Tomi Valkeinen
2012-03-08 15:29 ` Greg KH
2012-03-10 7:29 ` Tomi Valkeinen
2012-03-01 12:34 ` [PATCH 0/7] OMAPDSS: HDMI PHY burnout fix for 3.0 stable Tomi Valkeinen
2012-03-01 12:34 ` [PATCH 1/7] OMAP: DSS2: HDMI: use default dividers Tomi Valkeinen
2012-03-01 12:34 ` [PATCH 2/7] OMAP: 4430SDP/Panda: use gpio_free_array to free HDMI gpios Tomi Valkeinen
2012-03-01 12:34 ` [PATCH 3/7] OMAP: 4430SDP/Panda: rename HPD GPIO to CT_CP_HPD Tomi Valkeinen
2012-03-01 12:34 ` [PATCH 4/7] OMAPDSS: remove wrong HDMI HPD muxing Tomi Valkeinen
2012-03-01 12:34 ` [PATCH 5/7] OMAP: 4430SDP/Panda: setup HDMI GPIO muxes Tomi Valkeinen
2012-03-01 12:34 ` [PATCH 6/7] OMAP: 4430SDP/Panda: add HDMI HPD gpio Tomi Valkeinen
2012-03-01 12:34 ` [PATCH 7/7] OMAPDSS: HDMI: PHY burnout fix Tomi Valkeinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1330604795-29156-8-git-send-email-tomi.valkeinen@ti.com \
--to=tomi.valkeinen@ti.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=rob@ti.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).