Merge branch 'omap/cleanup' into next/cleanup2

[pandora-kernel.git] / arch / arm / mach-omap2 / voltagedomains3xxx_data.c

diff --git a/arch/arm/mach-omap2/voltagedomains3xxx_data.c b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
index 2167ef4..071101d 100644 (file)
--- a/arch/arm/mach-omap2/voltagedomains3xxx_data.c
+++ b/arch/arm/mach-omap2/voltagedomains3xxx_data.c
@@ -31,63 +31,70 @@
  * VDD data
  */
 
-static const struct omap_vfsm_instance_data omap3_vdd1_vfsm_data = {
+static const struct omap_vfsm_instance omap3_vdd1_vfsm = {
        .voltsetup_reg = OMAP3_PRM_VOLTSETUP1_OFFSET,
-       .voltsetup_shift = OMAP3430_SETUP_TIME1_SHIFT,
        .voltsetup_mask = OMAP3430_SETUP_TIME1_MASK,
 };
 
-static struct omap_vdd_info omap3_vdd1_info = {
-       .prm_irqst_mod = OCP_MOD,
-       .prm_irqst_reg = OMAP3_PRM_IRQSTATUS_MPU_OFFSET,
-       .vp_data = &omap3_vp1_data,
-       .vc_data = &omap3_vc1_data,
-       .vfsm = &omap3_vdd1_vfsm_data,
-};
-
-static const struct omap_vfsm_instance_data omap3_vdd2_vfsm_data = {
+static const struct omap_vfsm_instance omap3_vdd2_vfsm = {
        .voltsetup_reg = OMAP3_PRM_VOLTSETUP1_OFFSET,
-       .voltsetup_shift = OMAP3430_SETUP_TIME2_SHIFT,
        .voltsetup_mask = OMAP3430_SETUP_TIME2_MASK,
 };
 
-static struct omap_vdd_info omap3_vdd2_info = {
-       .prm_irqst_mod = OCP_MOD,
-       .prm_irqst_reg = OMAP3_PRM_IRQSTATUS_MPU_OFFSET,
-       .vp_data = &omap3_vp2_data,
-       .vc_data = &omap3_vc2_data,
-       .vfsm = &omap3_vdd2_vfsm_data,
-};
-
 static struct voltagedomain omap3_voltdm_mpu = {
        .name = "mpu_iva",
-       .vdd = &omap3_vdd1_info,
+       .scalable = true,
+       .read = omap3_prm_vcvp_read,
+       .write = omap3_prm_vcvp_write,
+       .rmw = omap3_prm_vcvp_rmw,
+       .vc = &omap3_vc_mpu,
+       .vfsm = &omap3_vdd1_vfsm,
+       .vp = &omap3_vp_mpu,
 };
 
 static struct voltagedomain omap3_voltdm_core = {
        .name = "core",
-       .vdd = &omap3_vdd2_info,
+       .scalable = true,
+       .read = omap3_prm_vcvp_read,
+       .write = omap3_prm_vcvp_write,
+       .rmw = omap3_prm_vcvp_rmw,
+       .vc = &omap3_vc_core,
+       .vfsm = &omap3_vdd2_vfsm,
+       .vp = &omap3_vp_core,
+};
+
+static struct voltagedomain omap3_voltdm_wkup = {
+       .name = "wakeup",
 };
 
 static struct voltagedomain *voltagedomains_omap3[] __initdata = {
        &omap3_voltdm_mpu,
        &omap3_voltdm_core,
+       &omap3_voltdm_wkup,
        NULL,
 };
 
+static const char *sys_clk_name __initdata = "sys_ck";
+
 void __init omap3xxx_voltagedomains_init(void)
 {
+       struct voltagedomain *voltdm;
+       int i;
+
        /*
         * XXX Will depend on the process, validation, and binning
         * for the currently-running IC
         */
        if (cpu_is_omap3630()) {
-               omap3_vdd1_info.volt_data = omap36xx_vddmpu_volt_data;
-               omap3_vdd2_info.volt_data = omap36xx_vddcore_volt_data;
+               omap3_voltdm_mpu.volt_data = omap36xx_vddmpu_volt_data;
+               omap3_voltdm_core.volt_data = omap36xx_vddcore_volt_data;
        } else {
-               omap3_vdd1_info.volt_data = omap34xx_vddmpu_volt_data;
-               omap3_vdd2_info.volt_data = omap34xx_vddcore_volt_data;
+               omap3_voltdm_mpu.volt_data = omap34xx_vddmpu_volt_data;
+               omap3_voltdm_core.volt_data = omap34xx_vddcore_volt_data;
        }
 
+       for (i = 0; voltdm = voltagedomains_omap3[i], voltdm; i++)
+               voltdm->sys_clk.name = sys_clk_name;
+
        voltdm_init(voltagedomains_omap3);
 };