msm: board-8960: Add regulator support for KS8851 ethernet device

Update existing regulator consumer mappings to use the new KS8851
regulator names: "vdd-io" and "vdd-phy".  Also, conditionally
remove the "vdd-phy" consumer mapping from the 8921_lvs6
regulator for CDP targets.  This ensures that both regulator_get
calls in the KS8851 driver succeed for CDP and non-CDP targets.

Change-Id: I7c3f3ec25b6a774b89a63955ff7e13f96c9776fa
Signed-off-by: David Collins <collinsd@codeaurora.org>
(cherry picked from commit e68647e762f8b00cc437e922966103a595e35d84)
diff --git a/arch/arm/mach-msm/board-8960.c b/arch/arm/mach-msm/board-8960.c
index 45c930ce..1c9637e 100644
--- a/arch/arm/mach-msm/board-8960.c
+++ b/arch/arm/mach-msm/board-8960.c
@@ -3086,6 +3086,7 @@
 	regulator_suppress_info_printing();
 	if (msm_xo_init())
 		pr_err("Failed to initialize XO votes\n");
+	configure_msm8960_power_grid();
 	platform_device_register(&msm8960_device_rpm_regulator);
 	msm_clock_init(&msm8960_clock_init_data);
 	if (machine_is_msm8960_liquid())