All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <ext-jani.1.nikula@nokia.com>
To: linux-omap@vger.kernel.org
Cc: juha.yrjola@solidboot.com, ext-jani.1.nikula@nokia.com
Subject: [PATCH v2] ARM: OMAP: Fix GPIO switch initial output state handling
Date: Wed, 11 Mar 2009 15:07:19 +0200	[thread overview]
Message-ID: <1236776839-15884-1-git-send-email-ext-jani.1.nikula@nokia.com> (raw)
In-Reply-To: <49B7A1E5.9060403@solidboot.com>

The switchover to cross-platform GPIO interface unexpectedly caused all
output GPIO switches to be set to high state by default, unlike the
original OMAP code. Introduce a new GPIO switch flag to define the
initial state of the switch. Unless the flag is set, the default is now
inactive state of the switch.

Also store the state of output switches directly into the switch struct
instead of trying to read an output GPIO.

Signed-off-by: Jani Nikula <ext-jani.1.nikula@nokia.com>
---
 arch/arm/plat-omap/gpio-switch.c              |   13 +++++++++----
 arch/arm/plat-omap/include/mach/gpio-switch.h |   11 ++++++-----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/arch/arm/plat-omap/gpio-switch.c b/arch/arm/plat-omap/gpio-switch.c
index 2b5665d..9053ea0 100644
--- a/arch/arm/plat-omap/gpio-switch.c
+++ b/arch/arm/plat-omap/gpio-switch.c
@@ -286,12 +286,17 @@ static int __init new_switch(struct gpio_switch *sw)
 
 	/* input: 1, output: 0 */
 	direction = !(sw->flags & OMAP_GPIO_SWITCH_FLAG_OUTPUT);
-	if (direction)
+	if (direction) {
 		gpio_direction_input(sw->gpio);
-	else
-		gpio_direction_output(sw->gpio, true);
+		sw->state = gpio_sw_get_state(sw);
+	} else {
+		int state = sw->state = !!(sw->flags &
+			OMAP_GPIO_SWITCH_FLAG_OUTPUT_INIT_ACTIVE);
 
-	sw->state = gpio_sw_get_state(sw);
+		if (sw->flags & OMAP_GPIO_SWITCH_FLAG_INVERTED)
+			state = !state;
+		gpio_direction_output(sw->gpio, state);
+	}
 
 	r = 0;
 	r |= device_create_file(&sw->pdev.dev, &dev_attr_state);
diff --git a/arch/arm/plat-omap/include/mach/gpio-switch.h b/arch/arm/plat-omap/include/mach/gpio-switch.h
index a143253..2096780 100644
--- a/arch/arm/plat-omap/include/mach/gpio-switch.h
+++ b/arch/arm/plat-omap/include/mach/gpio-switch.h
@@ -24,11 +24,12 @@
  *	low  -> inactive
  *
  */
-#define OMAP_GPIO_SWITCH_TYPE_COVER		0x0000
-#define OMAP_GPIO_SWITCH_TYPE_CONNECTION	0x0001
-#define OMAP_GPIO_SWITCH_TYPE_ACTIVITY		0x0002
-#define OMAP_GPIO_SWITCH_FLAG_INVERTED		0x0001
-#define OMAP_GPIO_SWITCH_FLAG_OUTPUT		0x0002
+#define OMAP_GPIO_SWITCH_TYPE_COVER			0x0000
+#define OMAP_GPIO_SWITCH_TYPE_CONNECTION		0x0001
+#define OMAP_GPIO_SWITCH_TYPE_ACTIVITY			0x0002
+#define OMAP_GPIO_SWITCH_FLAG_INVERTED			0x0001
+#define OMAP_GPIO_SWITCH_FLAG_OUTPUT			0x0002
+#define OMAP_GPIO_SWITCH_FLAG_OUTPUT_INIT_ACTIVE	0x0004
 
 struct omap_gpio_switch {
 	const char *name;
-- 
1.6.0.4


  reply	other threads:[~2009-03-11 13:08 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1236677181-16601-1-git-send-email-ext-jani.1.nikula@nokia.com>
2009-03-10 14:25 ` [PATCH] ARM: OMAP: Fix GPIO switch initial output state handling Kainan Cha
2009-03-11  9:03   ` Jani Nikula
2009-03-11 11:35     ` Juha Yrjola
2009-03-11 13:07       ` Jani Nikula [this message]
2009-03-11 13:35         ` [PATCH v2] " Kainan Cha
2009-03-11 16:38         ` [APPLIED] " Tony Lindgren

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=1236776839-15884-1-git-send-email-ext-jani.1.nikula@nokia.com \
    --to=ext-jani.1.nikula@nokia.com \
    --cc=juha.yrjola@solidboot.com \
    --cc=linux-omap@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.