diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
index 6ceac87..98d2d65 100644
--- a/arch/arm/boot/dts/omap4-sdp.dts
+++ b/arch/arm/boot/dts/omap4-sdp.dts
@@ -517,3 +517,23 @@
 	mode = <3>;
 	power = <50>;
 };
+
+&omap_twl6030_vcore1 {
+	ti,boot-voltage-micro-volts=<1200000>;
+	ti,vp=<&vp_mpu>;
+};
+
+&omap_twl6030_vcore2 {
+	ti,boot-voltage-micro-volts=<1200000>;
+	ti,vp = <&vp_iva>;
+};
+
+&omap_twl6030_vcore3 {
+	ti,boot-voltage-micro-volts=<1200000>;
+	ti,vp = <&vp_core>;
+};
+
+&vc {
+	ti,i2c-high-speed;
+	ti,i2c-pad-load=<3>;
+};
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index a103db2..a28c8b1 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -718,7 +718,7 @@
 			ti,max-step-micro-volts = <50000>;
 			/* HACKs: belongs to SoC specific file */
 			ti,min-micro-volts = <750000>;
-			ti,max-micro-volts = <1410000>;
+			ti,max-micro-volts = <1388000>;
 		};

 		vp_iva: vp@0x4a307b70 {
@@ -737,7 +737,7 @@
 			ti,min-step-micro-volts = <10000>;
 			ti,max-step-micro-volts = <50000>;
 			ti,min-micro-volts = <750000>;
-			ti,max-micro-volts = <1260000>;
+			ti,max-micro-volts = <1291000>;
 		};

 		vp_core: vp@0x4a307b40 {
@@ -757,7 +757,7 @@
 			ti,min-step-micro-volts = <10000>;
 			ti,max-step-micro-volts = <50000>;
 			ti,min-micro-volts = <830000>;
-			ti,max-micro-volts = <1200000>;
+			ti,max-micro-volts = <1127000>;
 		};
 	};
 };
diff --git a/arch/arm/boot/dts/omap443x.dtsi b/arch/arm/boot/dts/omap443x.dtsi
index cccf39a..767e2c3 100644
--- a/arch/arm/boot/dts/omap443x.dtsi
+++ b/arch/arm/boot/dts/omap443x.dtsi
@@ -22,6 +22,7 @@
 				1008000 1375000
 			>;
 			clock-latency = <300000>; /* From legacy driver */
+			cpu0-supply = <&omap_twl6030_vcore1>; /* HACK: belongs to board file */
 		};
 	};
 };
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index 129a854d..2d80aa2 100644
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -287,3 +287,11 @@ CONFIG_TI_CPSW=y
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND=y
+
+CONFIG_REGULATOR_TI_OMAP_PMIC=y
+CONFIG_POWER_TI_HARDWARE_VOLTAGE_CONTROL=y
+CONFIG_POWER_AVS=y
+CONFIG_CPU_FREQ=y
+CONFIG_GENERIC_CPUFREQ_CPU0=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y