From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: stable@vger.kernel.org
Cc: linux-fbdev@vger.kernel.org, linux-omap@vger.kernel.org,
Tomi Valkeinen <tomi.valkeinen@ti.com>
Subject: [PATCH 3/7] OMAP: 4430SDP/Panda: rename HPD GPIO to CT_CP_HPD
Date: Thu, 01 Mar 2012 12:34:42 +0000 [thread overview]
Message-ID: <1330605286-24166-4-git-send-email-tomi.valkeinen@ti.com> (raw)
In-Reply-To: <1330605286-24166-1-git-send-email-tomi.valkeinen@ti.com>
The GPIO 60 on 4430sdp and Panda is not HPD GPIO, as currently marked in
the board files, but CT_CP_HPD, which is used to enable/disable HPD
functionality.
This patch renames the GPIO.
Backported from 3932a32fcf5393f8be70ac99dc718ad7ad0a415b
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/board-4430sdp.c | 4 ++--
arch/arm/mach-omap2/board-omap4panda.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index 7feefb8..d0a49c3 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -49,7 +49,7 @@
#define ETH_KS8851_QUART 138
#define OMAP4_SFH7741_SENSOR_OUTPUT_GPIO 184
#define OMAP4_SFH7741_ENABLE_GPIO 188
-#define HDMI_GPIO_HPD 60 /* Hot plug pin for HDMI */
+#define HDMI_GPIO_CT_CP_HPD 60 /* HPD mode enable/disable */
#define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */
static const int sdp4430_keymap[] = {
@@ -591,7 +591,7 @@ static void sdp4430_hdmi_mux_init(void)
}
static struct gpio sdp4430_hdmi_gpios[] = {
- { HDMI_GPIO_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_hpd" },
+ { HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" },
{ HDMI_GPIO_LS_OE, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ls_oe" },
};
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index 2e9a6f36..bc98749 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -52,7 +52,7 @@
#define GPIO_HUB_NRESET 62
#define GPIO_WIFI_PMENA 43
#define GPIO_WIFI_IRQ 53
-#define HDMI_GPIO_HPD 60 /* Hot plug pin for HDMI */
+#define HDMI_GPIO_CT_CP_HPD 60 /* HPD mode enable/disable */
#define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */
/* wl127x BT, FM, GPS connectivity chip */
@@ -627,7 +627,7 @@ static void omap4_panda_hdmi_mux_init(void)
}
static struct gpio panda_hdmi_gpios[] = {
- { HDMI_GPIO_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_hpd" },
+ { HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" },
{ HDMI_GPIO_LS_OE, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ls_oe" },
};
--
1.7.4.1
next prev parent reply other threads:[~2012-03-01 12:34 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 ` [PATCH 7/7] OMAPDSS: HDMI: hot plug detect fix Tomi Valkeinen
2012-03-07 20:01 ` 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 ` Tomi Valkeinen [this message]
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=1330605286-24166-4-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=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).