commit 6d64bd7f6cbe403cbaf4ce6c0c56c77d9a76c392
author Jay Chokshi <jchokshi@codeaurora.org> Wed May 02 16:47:03 2012 -0700
committer Linux Build Service Account <lnxbuild@localhost> Sat Jun 09 08:21:08 2012 -0600
tree af9d5e334905669af4220a5527376a2d104848cf
parent 56a32c5c9c0b1efa37e1f3469d199ce764e510c6

msm: 8064-regulator: Remove 5V FRC gpio external regulator

On MPQ-8064, 5V FRC regulator coordinates with FRC
reset signal in certain timing sequence, which is
controlled by FRC driver powerup sequence. The FRC driver
is implemented in Userspace.

Since kernel claims the same GPIO line to control as a
gpio voltage regulator, FRC Userspace driver fails to
handle it. Relinquish the control of the gpio line
as there are no kernel clients of the gpio anyways.

Change-Id: I3ab18358ab236e0e6b36bbfb81019b60e3501165
Signed-off-by: Jay Chokshi <jchokshi@codeaurora.org>

arch/arm/mach-msm/board-8064.h

diff --git a/arch/arm/mach-msm/board-8064.h b/arch/arm/mach-msm/board-8064.h
index c992865..7cef156 100644
--- a/arch/arm/mach-msm/board-8064.h
+++ b/arch/arm/mach-msm/board-8064.h
@@ -45,12 +45,11 @@
 #define GPIO_VREG_ID_EXT_TS_SW		2
 #define GPIO_VREG_ID_EXT_MPP8		3
 
-#define GPIO_VREG_ID_FRC_5V		0
-#define GPIO_VREG_ID_AVC_1P2V		1
-#define GPIO_VREG_ID_AVC_1P8V		2
-#define GPIO_VREG_ID_AVC_2P2V		3
-#define GPIO_VREG_ID_AVC_5V		4
-#define GPIO_VREG_ID_AVC_3P3V		5
+#define GPIO_VREG_ID_AVC_1P2V		0
+#define GPIO_VREG_ID_AVC_1P8V		1
+#define GPIO_VREG_ID_AVC_2P2V		2
+#define GPIO_VREG_ID_AVC_5V		3
+#define GPIO_VREG_ID_AVC_3P3V		4
 
 #define APQ8064_EXT_3P3V_REG_EN_GPIO	77