Power changes: Removed dummy regulators, added cpufreq table initialization and makes sure that cpufreq gets initialized properly.

Change-Id: I679d86c150e4acee098e4a5cfe1855d46fac872a

2 files changed, 25 insertions, 17 deletions

diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 9973c97bc09..36a93cc41c0 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -267,7 +267,7 @@
 			dma-names = "tx0", "rx0", "tx1", "rx1",
 				    "tx2", "rx2", "tx3", "rx3";
 		};
-        /*
+        
 		mcspi2: spi@4809a000 {
 			compatible = "ti,omap2-mcspi";
 			#address-cells = <1>;
@@ -303,7 +303,7 @@
 			dmas = <&sdma 70>, <&sdma 71>;
 			dma-names = "tx0", "rx0";
 		};
-        */
+       
 		mmc1: mmc@4809c000 {
 			compatible = "ti,omap3-hsmmc";
 			ti,hwmods = "mmc1";
diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts
index fbf8796599d..40964563a1e 100644
--- a/arch/arm/boot/dts/omap3_h1.dts
+++ b/arch/arm/boot/dts/omap3_h1.dts
@@ -20,12 +20,12 @@
 		cpu@0 {
 			device_type = "cpu";
 			operating-points = <
-				/* kHz    uV */
-				 300000   975000
-				 600000  1150000
-				 800000  1275000
+				/* kHz    uV (from opp3xxx_data.c) */
+				 300000  1012500
+				 600000  1200000
+				 800000  1325000
 			>;
-			cpu0-supply = <&vdd1_reg>;
+			cpu0-supply = <&omap_tps65910>;
 			/* OPP tolerance in percentage */
 			voltage-tolerance = <0>;
 			reset-voltage = <1275000>;
@@ -40,7 +40,13 @@
 		regulator-boot-on;
 	};
 
-	/*
+	/* omap_pimic is used by the omap-pmic-regulator driver - a 
+	 * generic framework for omap interfacing with i2c drivers, based
+	 * on the TWL framework.
+	 *
+	 * This is the two regulators needed by the AM3603. 
+	 */
+
 	omap_pimic {
 		omap_tps65910: omap_vdd1 {
 			compatible = "ti,omap-tps65910-vdd1";
@@ -54,7 +60,6 @@
 			ti,vp = <&vp_core>;
 		};
 	};
-        */
 
 	pad-wkup {
 		/* on omap, the irqs are calculated as follows:
@@ -94,13 +99,15 @@
 &vc {
 	ti,i2c-high-speed;
 	ti,i2c-pad-load = <3>;
-	vc_mpu{
+
+	vc_mpu {
 		ti,master-channel;
 	};
 
-	vc_core{
+	vc_core {
 		ti,use-master-slave-addr;
 	};
+       
 };
 
 &glbl_prm {
@@ -302,7 +309,9 @@
 
 	/* This is from GL's suspend branch */
 	/* crystal oscillator is installed on the board */
+
 	ti,en-ck32k-xtal;
+
 	/* set SR_CTL_I2C_SEL - access to smartreflex registers by control i2c */
 	/* ti,system-power-controller; */
 
@@ -321,7 +330,7 @@
 			ti,regulator-ext-sleep-control = <8>;
 		};
 
-		/* DSS is on this one */
+		/* DSS is on this one (and much else) */
 	vio_reg: regulator@1 {
 			regulator-name = "vdds_dsi";
 			regulator-min-microvolt = <1800000>;
@@ -330,7 +339,6 @@
 		};
 
 		/* Leave one and two on for reliable wake-up */
-
 	vdd1_reg: regulator@2 {
 			/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
 			/*
@@ -339,9 +347,9 @@
 			*/
 			/* external sleep control by means of SYS_OFF_MODE signal */
 			/* regulator-name = "vdd_mpu_iva"; */
-			regulator-name = "cpu0";
-			regulator-min-microvolt = <900000>;
-			regulator-max-microvolt = <1350000>;
+			regulator-name = "vdd_mpu_iva";
+			regulator-min-microvolt = <975000>;
+			regulator-max-microvolt = <1275000>;
 
 			ti,regulator-ext-sleep-control = <8>;
 		};
@@ -426,7 +434,7 @@
 		 * specify two consumers in DT? (vdd for dss, avdd for touch).
 		 */
 	vmmc_reg: regulator@12 {
-			regulator-name = "vdds_dsi";
+			regulator-name = "avdd";
 			regulator-min-microvolt = <3300000>;
 			regulator-max-microvolt = <3300000>;
 			regulator-always-on;