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: Benoit Cousson <b-cousson@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>

1 files changed, 15 insertions, 7 deletions

diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index 0844e2ecfb4a..7c038ea42093 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -169,18 +169,26 @@ err:
  * in the opp entry
  */
 static int __init omap2_set_init_voltage(char *vdd_name, char *clk_name,
-                                                struct device *dev)
+                                         const char *oh_name)
 {
         struct voltagedomain *voltdm;
         struct clk *clk;
         struct opp *opp;
         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__);
                 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);
         if (IS_ERR(voltdm)) {
                 pr_err("%s: unable to get vdd pointer for vdd_%s\n",
@@ -224,8 +232,8 @@ static void __init omap3_init_voltages(void)
         if (!cpu_is_omap34xx())
                 return;
 
-        omap2_set_init_voltage("mpu_iva", "dpll1_ck", mpu_dev);
-        omap2_set_init_voltage("core", "l3_ick", l3_dev);
+        omap2_set_init_voltage("mpu_iva", "dpll1_ck", "mpu");
+        omap2_set_init_voltage("core", "l3_ick", "l3_main");
 }
 
 static void __init omap4_init_voltages(void)
@@ -233,9 +241,9 @@ static void __init omap4_init_voltages(void)
         if (!cpu_is_omap44xx())
                 return;
 
-        omap2_set_init_voltage("mpu", "dpll_mpu_ck", mpu_dev);
-        omap2_set_init_voltage("core", "l3_div_ck", l3_dev);
-        omap2_set_init_voltage("iva", "dpll_iva_m5x2_ck", iva_dev);
+        omap2_set_init_voltage("mpu", "dpll_mpu_ck", "mpu");
+        omap2_set_init_voltage("core", "l3_div_ck", "l3_main_1");
+        omap2_set_init_voltage("iva", "dpll_iva_m5x2_ck", "iva");
 }
 
 static int __init omap2_common_pm_init(void)