X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=blobdiff_plain;f=arch%2Farm%2Fmach-omap2%2Fpm.c;fp=arch%2Farm%2Fmach-omap2%2Fpm.c;h=0844e2ecfb4ab56c7330cec33e6dbeb526bdf223;hp=25b8c7f43852cbd5af4cd39586b8d66af40137a5;hb=cd9a0b6bd67ec372b0ef3cb2abe26974f888b956;hpb=ac5761a650d22dd7dfad4d417463a0981d2da0a4 diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index 25b8c7f43852..0844e2ecfb4a 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -181,7 +181,7 @@ static int __init omap2_set_init_voltage(char *vdd_name, char *clk_name, goto exit; } - voltdm = omap_voltage_domain_lookup(vdd_name); + voltdm = voltdm_lookup(vdd_name); if (IS_ERR(voltdm)) { pr_err("%s: unable to get vdd pointer for vdd_%s\n", __func__, vdd_name); @@ -211,7 +211,7 @@ static int __init omap2_set_init_voltage(char *vdd_name, char *clk_name, goto exit; } - omap_voltage_scale_vdd(voltdm, bootup_volt); + voltdm_scale(voltdm, bootup_volt); return 0; exit: @@ -224,7 +224,7 @@ static void __init omap3_init_voltages(void) if (!cpu_is_omap34xx()) return; - omap2_set_init_voltage("mpu", "dpll1_ck", mpu_dev); + omap2_set_init_voltage("mpu_iva", "dpll1_ck", mpu_dev); omap2_set_init_voltage("core", "l3_ick", l3_dev); }