msm: board-8930: Use saw-regulator driver to control Krait supplies

Switch control of the Krait supply regulators, PMIC 8038 S5 and
S6, from the pm8xxx-regulator driver to the saw-regulator driver.
This ensures that core voltages return to proper values after
power collapse.

Change-Id: Icef28301a8f0a6fd2447c0d62c75d5ce4f7bcfcb
Signed-off-by: David Collins <collinsd@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-8930.c b/arch/arm/mach-msm/board-8930.c
index c2592ae..fa548aa 100644
--- a/arch/arm/mach-msm/board-8930.c
+++ b/arch/arm/mach-msm/board-8930.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
+/* Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -1415,14 +1415,7 @@
 	.name	= "saw-regulator",
 	.id	= 0,
 	.dev	= {
-	/*
-	 * TODO: When physical 8930/PM8038 hardware becomes
-	 * available, replace msm_saw_regulator_pdata_s5
-	 * with 8930 saw regulator object.
-	 */
-#ifndef MSM8930_PHASE_2
-		.platform_data = &msm_saw_regulator_pdata_s5,
-#endif
+		.platform_data = &msm8930_saw_regulator_core0_pdata,
 	},
 };
 
@@ -1430,14 +1423,7 @@
 	.name	= "saw-regulator",
 	.id	= 1,
 	.dev	= {
-	/*
-	 * TODO: When physical 8930/PM8038 hardware becomes
-	 * available, replace msm_saw_regulator_pdata_s5
-	 * with 8930 saw regulator object.
-	 */
-#if     !defined(MSM8930_PHASE_2)
-		.platform_data = &msm_saw_regulator_pdata_s6,
-#endif
+		.platform_data = &msm8930_saw_regulator_core1_pdata,
 	},
 };