Merge tag 'for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[cascardo/linux.git] / arch / arm / mach-omap2 / voltagedomains44xx_data.c

diff --git a/arch/arm/mach-omap2/voltagedomains44xx_data.c b/arch/arm/mach-omap2/voltagedomains44xx_data.c
index c3115f6..48b22a0 100644 (file)
--- a/arch/arm/mach-omap2/voltagedomains44xx_data.c
+++ b/arch/arm/mach-omap2/voltagedomains44xx_data.c
@@ -22,7 +22,7 @@
 #include <linux/init.h>
 
 #include "common.h"
-
+#include "soc.h"
 #include "prm-regbits-44xx.h"
 #include "prm44xx.h"
 #include "prcm44xx.h"
@@ -34,14 +34,17 @@
 
 static const struct omap_vfsm_instance omap4_vdd_mpu_vfsm = {
        .voltsetup_reg = OMAP4_PRM_VOLTSETUP_MPU_RET_SLEEP_OFFSET,
+       .voltsetup_off_reg = OMAP4_PRM_VOLTSETUP_MPU_OFF_OFFSET,
 };
 
 static const struct omap_vfsm_instance omap4_vdd_iva_vfsm = {
        .voltsetup_reg = OMAP4_PRM_VOLTSETUP_IVA_RET_SLEEP_OFFSET,
+       .voltsetup_off_reg = OMAP4_PRM_VOLTSETUP_IVA_OFF_OFFSET,
 };
 
 static const struct omap_vfsm_instance omap4_vdd_core_vfsm = {
        .voltsetup_reg = OMAP4_PRM_VOLTSETUP_CORE_RET_SLEEP_OFFSET,
+       .voltsetup_off_reg = OMAP4_PRM_VOLTSETUP_CORE_OFF_OFFSET,
 };
 
 static struct voltagedomain omap4_voltdm_mpu = {
@@ -101,11 +104,25 @@ void __init omap44xx_voltagedomains_init(void)
         * for the currently-running IC
         */
 #ifdef CONFIG_PM_OPP
-       omap4_voltdm_mpu.volt_data = omap44xx_vdd_mpu_volt_data;
-       omap4_voltdm_iva.volt_data = omap44xx_vdd_iva_volt_data;
-       omap4_voltdm_core.volt_data = omap44xx_vdd_core_volt_data;
+       if (cpu_is_omap443x()) {
+               omap4_voltdm_mpu.volt_data = omap443x_vdd_mpu_volt_data;
+               omap4_voltdm_iva.volt_data = omap443x_vdd_iva_volt_data;
+               omap4_voltdm_core.volt_data = omap443x_vdd_core_volt_data;
+       } else if (cpu_is_omap446x()) {
+               omap4_voltdm_mpu.volt_data = omap446x_vdd_mpu_volt_data;
+               omap4_voltdm_iva.volt_data = omap446x_vdd_iva_volt_data;
+               omap4_voltdm_core.volt_data = omap446x_vdd_core_volt_data;
+       }
 #endif
 
+       omap4_voltdm_mpu.vp_param = &omap4_mpu_vp_data;
+       omap4_voltdm_iva.vp_param = &omap4_iva_vp_data;
+       omap4_voltdm_core.vp_param = &omap4_core_vp_data;
+
+       omap4_voltdm_mpu.vc_param = &omap4_mpu_vc_data;
+       omap4_voltdm_iva.vc_param = &omap4_iva_vc_data;
+       omap4_voltdm_core.vc_param = &omap4_core_vc_data;
+
        for (i = 0; voltdm = voltagedomains_omap4[i], voltdm; i++)
                voltdm->sys_clk.name = sys_clk_name;