Merge branch 'for_3.2/voltage-cleanup' of git://gitorious.org/khilman/linux-omap-pm into voltage

1 files changed, 5 insertions, 0 deletions

diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 1a13b7916554..15f91c42be66 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -38,6 +38,7 @@
 #include "io.h"
 
 #include <plat/omap-pm.h>
+#include "voltage.h"
 #include "powerdomain.h"
 
 #include "clockdomain.h"
@@ -341,18 +342,22 @@ void __init omap2_init_common_infrastructure(void)
         u8 postsetup_state;
 
         if (cpu_is_omap242x()) {
+                omap2xxx_voltagedomains_init();
                 omap242x_powerdomains_init();
                 omap242x_clockdomains_init();
                 omap2420_hwmod_init();
         } else if (cpu_is_omap243x()) {
+                omap2xxx_voltagedomains_init();
                 omap243x_powerdomains_init();
                 omap243x_clockdomains_init();
                 omap2430_hwmod_init();
         } else if (cpu_is_omap34xx()) {
+                omap3xxx_voltagedomains_init();
                 omap3xxx_powerdomains_init();
                 omap3xxx_clockdomains_init();
                 omap3xxx_hwmod_init();
         } else if (cpu_is_omap44xx()) {
+                omap44xx_voltagedomains_init();
                 omap44xx_powerdomains_init();
                 omap44xx_clockdomains_init();
                 omap44xx_hwmod_init();