From e8b18f3b5f49a875bca250b51c508ab9dadf18bf Mon Sep 17 00:00:00 2001
From: Rabin Vincent <rabin.vincent@stericsson.com>
Date: Thu, 27 May 2010 12:22:42 +0100
Subject: [PATCH] --- yaml --- r: 201439 b: refs/heads/master c:
 6647c6c0b62ae14ca994c5776ddb084820bea808 h: refs/heads/master i:   201437:
 e3f5aaa2fa02c2c826f1d8d5a890ca2ee00869bb   201435:
 5ffae53ee5d1e4892d375e5af0e636296d80cc22   201431:
 d05ad67baf2d2ee5cfb436861a540ee1fd3298a4   201423:
 2964b184d5d6e5c3112bbb8cde594db481fc0a12   201407:
 c53f26cec60ce699d8d72fed419b3b0d592936fa v: v3

---
 [refs]                             |  2 +-
 trunk/arch/arm/plat-nomadik/gpio.c | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index d9a212810a7c..ca641cb593fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c0c1f08abf094273f40a6d6fd4519fcacc6c58d
+refs/heads/master: 6647c6c0b62ae14ca994c5776ddb084820bea808
diff --git a/trunk/arch/arm/plat-nomadik/gpio.c b/trunk/arch/arm/plat-nomadik/gpio.c
index 5a6ef252c38b..13cdbbdc08ca 100644
--- a/trunk/arch/arm/plat-nomadik/gpio.c
+++ b/trunk/arch/arm/plat-nomadik/gpio.c
@@ -266,16 +266,6 @@ static int nmk_gpio_make_input(struct gpio_chip *chip, unsigned offset)
 	return 0;
 }
 
-static int nmk_gpio_make_output(struct gpio_chip *chip, unsigned offset,
-				int val)
-{
-	struct nmk_gpio_chip *nmk_chip =
-		container_of(chip, struct nmk_gpio_chip, chip);
-
-	writel(1 << offset, nmk_chip->addr + NMK_GPIO_DIRS);
-	return 0;
-}
-
 static int nmk_gpio_get_input(struct gpio_chip *chip, unsigned offset)
 {
 	struct nmk_gpio_chip *nmk_chip =
@@ -298,6 +288,18 @@ static void nmk_gpio_set_output(struct gpio_chip *chip, unsigned offset,
 		writel(bit, nmk_chip->addr + NMK_GPIO_DATC);
 }
 
+static int nmk_gpio_make_output(struct gpio_chip *chip, unsigned offset,
+				int val)
+{
+	struct nmk_gpio_chip *nmk_chip =
+		container_of(chip, struct nmk_gpio_chip, chip);
+
+	writel(1 << offset, nmk_chip->addr + NMK_GPIO_DIRS);
+	nmk_gpio_set_output(chip, offset, val);
+
+	return 0;
+}
+
 /* This structure is replicated for each GPIO block allocated at probe time */
 static struct gpio_chip nmk_gpio_template = {
 	.direction_input	= nmk_gpio_make_input,