Commit 0f7aa005 authored by Benoit Cousson's avatar Benoit Cousson Committed by Kevin Hilman

ARM: OMAP2+: pm: Use hwmod name instead of dev pointer

Replace the struct device parameter of omap2_set_init_voltage
by the hwmod name. It will avoid having to store explicitely
the device pointer into a static variable.

Moreover, it will be a little bit more scalable if we introduce
new DVFS devices.
Signed-off-by: default avatarBenoit Cousson <b-cousson@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent b1621fc8
...@@ -169,18 +169,26 @@ int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state) ...@@ -169,18 +169,26 @@ int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state)
* in the opp entry * in the opp entry
*/ */
static int __init omap2_set_init_voltage(char *vdd_name, char *clk_name, static int __init omap2_set_init_voltage(char *vdd_name, char *clk_name,
struct device *dev) const char *oh_name)
{ {
struct voltagedomain *voltdm; struct voltagedomain *voltdm;
struct clk *clk; struct clk *clk;
struct opp *opp; struct opp *opp;
unsigned long freq, bootup_volt; unsigned long freq, bootup_volt;
struct device *dev;
if (!vdd_name || !clk_name || !dev) { if (!vdd_name || !clk_name || !oh_name) {
pr_err("%s: invalid parameters\n", __func__); pr_err("%s: invalid parameters\n", __func__);
goto exit; goto exit;
} }
dev = omap_device_get_by_hwmod_name(oh_name);
if (IS_ERR(dev)) {
pr_err("%s: Unable to get dev pointer for hwmod %s\n",
__func__, oh_name);
goto exit;
}
voltdm = voltdm_lookup(vdd_name); voltdm = voltdm_lookup(vdd_name);
if (IS_ERR(voltdm)) { if (IS_ERR(voltdm)) {
pr_err("%s: unable to get vdd pointer for vdd_%s\n", pr_err("%s: unable to get vdd pointer for vdd_%s\n",
...@@ -224,8 +232,8 @@ static void __init omap3_init_voltages(void) ...@@ -224,8 +232,8 @@ static void __init omap3_init_voltages(void)
if (!cpu_is_omap34xx()) if (!cpu_is_omap34xx())
return; return;
omap2_set_init_voltage("mpu_iva", "dpll1_ck", mpu_dev); omap2_set_init_voltage("mpu_iva", "dpll1_ck", "mpu");
omap2_set_init_voltage("core", "l3_ick", l3_dev); omap2_set_init_voltage("core", "l3_ick", "l3_main");
} }
static void __init omap4_init_voltages(void) static void __init omap4_init_voltages(void)
...@@ -233,9 +241,9 @@ static void __init omap4_init_voltages(void) ...@@ -233,9 +241,9 @@ static void __init omap4_init_voltages(void)
if (!cpu_is_omap44xx()) if (!cpu_is_omap44xx())
return; return;
omap2_set_init_voltage("mpu", "dpll_mpu_ck", mpu_dev); omap2_set_init_voltage("mpu", "dpll_mpu_ck", "mpu");
omap2_set_init_voltage("core", "l3_div_ck", l3_dev); omap2_set_init_voltage("core", "l3_div_ck", "l3_main_1");
omap2_set_init_voltage("iva", "dpll_iva_m5x2_ck", iva_dev); omap2_set_init_voltage("iva", "dpll_iva_m5x2_ck", "iva");
} }
static int __init omap2_common_pm_init(void) static int __init omap2_common_pm_init(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment