From 32b2ee2308ad5fc7d1fa83942ccc57d812330796 Mon Sep 17 00:00:00 2001
From: Sundar Iyer <sundar.iyer@stericsson.com>
Date: Mon, 13 Dec 2010 09:33:17 +0530
Subject: [PATCH] --- yaml --- r: 226024 b: refs/heads/master c:
 523bc3820f023169671e9726b8dc075669d14bec h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/mfd/tc3589x.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 17d0256f907c..a525e07a5be2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd77efd0cea80865d4cfcc1e4b62789c51a74b2d
+refs/heads/master: 523bc3820f023169671e9726b8dc075669d14bec
diff --git a/trunk/drivers/mfd/tc3589x.c b/trunk/drivers/mfd/tc3589x.c
index 708349a5c0e3..f000d2ed23e0 100644
--- a/trunk/drivers/mfd/tc3589x.c
+++ b/trunk/drivers/mfd/tc3589x.c
@@ -231,12 +231,15 @@ static int tc3589x_chip_init(struct tc3589x *tc3589x)
 
 	dev_info(tc3589x->dev, "manufacturer: %#x, version: %#x\n", manf, ver);
 
-	/* Put everything except the IRQ module into reset */
+	/*
+	 * Put everything except the IRQ module into reset;
+	 * also spare the GPIO module for any pin initialization
+	 * done during pre-kernel boot
+	 */
 	ret = tc3589x_reg_write(tc3589x, TC3589x_RSTCTRL,
 				TC3589x_RSTCTRL_TIMRST
 				| TC3589x_RSTCTRL_ROTRST
-				| TC3589x_RSTCTRL_KBDRST
-				| TC3589x_RSTCTRL_GPIRST);
+				| TC3589x_RSTCTRL_KBDRST);
 	if (ret < 0)
 		return ret;