Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock

[pandora-kernel.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 dd4bd22..c4584e9 100644 (file)
--- a/arch/arm/mach-omap2/voltagedomains44xx_data.c
+++ b/arch/arm/mach-omap2/voltagedomains44xx_data.c
@@ -36,26 +36,14 @@ static const struct omap_vfsm_instance omap4_vdd_mpu_vfsm = {
        .voltsetup_reg = OMAP4_PRM_VOLTSETUP_MPU_RET_SLEEP_OFFSET,
 };
 
-static struct omap_vdd_info omap4_vdd_mpu_info = {
-       .vp_data = &omap4_vp_mpu_data,
-};
-
 static const struct omap_vfsm_instance omap4_vdd_iva_vfsm = {
        .voltsetup_reg = OMAP4_PRM_VOLTSETUP_IVA_RET_SLEEP_OFFSET,
 };
 
-static struct omap_vdd_info omap4_vdd_iva_info = {
-       .vp_data = &omap4_vp_iva_data,
-};
-
 static const struct omap_vfsm_instance omap4_vdd_core_vfsm = {
        .voltsetup_reg = OMAP4_PRM_VOLTSETUP_CORE_RET_SLEEP_OFFSET,
 };
 
-static struct omap_vdd_info omap4_vdd_core_info = {
-       .vp_data = &omap4_vp_core_data,
-};
-
 static struct voltagedomain omap4_voltdm_mpu = {
        .name = "mpu",
        .scalable = true,
@@ -64,7 +52,7 @@ static struct voltagedomain omap4_voltdm_mpu = {
        .rmw = omap4_prm_vcvp_rmw,
        .vc = &omap4_vc_mpu,
        .vfsm = &omap4_vdd_mpu_vfsm,
-       .vdd = &omap4_vdd_mpu_info,
+       .vp = &omap4_vp_mpu,
 };
 
 static struct voltagedomain omap4_voltdm_iva = {
@@ -75,7 +63,7 @@ static struct voltagedomain omap4_voltdm_iva = {
        .rmw = omap4_prm_vcvp_rmw,
        .vc = &omap4_vc_iva,
        .vfsm = &omap4_vdd_iva_vfsm,
-       .vdd = &omap4_vdd_iva_info,
+       .vp = &omap4_vp_iva,
 };
 
 static struct voltagedomain omap4_voltdm_core = {
@@ -86,7 +74,7 @@ static struct voltagedomain omap4_voltdm_core = {
        .rmw = omap4_prm_vcvp_rmw,
        .vc = &omap4_vc_core,
        .vfsm = &omap4_vdd_core_vfsm,
-       .vdd = &omap4_vdd_core_info,
+       .vp = &omap4_vp_core,
 };
 
 static struct voltagedomain omap4_voltdm_wkup = {
@@ -101,15 +89,23 @@ static struct voltagedomain *voltagedomains_omap4[] __initdata = {
        NULL,
 };
 
+static const char *sys_clk_name __initdata = "sys_clkin_ck";
+
 void __init omap44xx_voltagedomains_init(void)
 {
+       struct voltagedomain *voltdm;
+       int i;
+
        /*
         * XXX Will depend on the process, validation, and binning
         * for the currently-running IC
         */
-       omap4_vdd_mpu_info.volt_data = omap44xx_vdd_mpu_volt_data;
-       omap4_vdd_iva_info.volt_data = omap44xx_vdd_iva_volt_data;
-       omap4_vdd_core_info.volt_data = omap44xx_vdd_core_volt_data;
+       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;
+
+       for (i = 0; voltdm = voltagedomains_omap4[i], voltdm; i++)
+               voltdm->sys_clk.name = sys_clk_name;
 
        voltdm_init(voltagedomains_omap4);
 };