4 files changed, 13 insertions, 18 deletions

diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index fb11ec176d55..501660aae962 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -416,18 +416,18 @@ static int _init_main_clk(struct omap_hwmod *oh)
         struct clk *c;
         int ret = 0;
 
-        if (!oh->clkdev_con_id)
+        if (!oh->main_clk)
                 return 0;
 
-        c = clk_get_sys(oh->clkdev_dev_id, oh->clkdev_con_id);
-        WARN(IS_ERR(c), "omap_hwmod: %s: cannot clk_get main_clk %s.%s\n",
-             oh->name, oh->clkdev_dev_id, oh->clkdev_con_id);
+        c = omap_clk_get_by_name(oh->main_clk);
+        WARN(IS_ERR(c), "omap_hwmod: %s: cannot clk_get main_clk %s\n",
+             oh->name, oh->main_clk);
         if (IS_ERR(c))
                 ret = -EINVAL;
         oh->_clk = c;
 
         WARN(!c->clkdm, "omap_hwmod: %s: missing clockdomain for %s.\n",
-             oh->clkdev_con_id, c->name);
+             oh->main_clk, c->name);
 
         return ret;
 }
@@ -450,13 +450,12 @@ static int _init_interface_clks(struct omap_hwmod *oh)
                 return 0;
 
         for (i = 0, os = *oh->slaves; i < oh->slaves_cnt; i++, os++) {
-                if (!os->clkdev_con_id)
+                if (!os->clk)
                         continue;
 
-                c = clk_get_sys(os->clkdev_dev_id, os->clkdev_con_id);
+                c = omap_clk_get_by_name(os->clk);
                 WARN(IS_ERR(c), "omap_hwmod: %s: cannot clk_get "
-                     "interface_clk %s.%s\n", oh->name,
-                     os->clkdev_dev_id, os->clkdev_con_id);
+                     "interface_clk %s\n", oh->name, os->clk);
                 if (IS_ERR(c))
                         ret = -EINVAL;
                 os->_clk = c;
@@ -480,10 +479,9 @@ static int _init_opt_clks(struct omap_hwmod *oh)
         int ret = 0;
 
         for (i = oh->opt_clks_cnt, oc = oh->opt_clks; i > 0; i--, oc++) {
-                c = clk_get_sys(oc->clkdev_dev_id, oc->clkdev_con_id);
+                c = omap_clk_get_by_name(oc->clk);
                 WARN(IS_ERR(c), "omap_hwmod: %s: cannot clk_get opt_clk "
-                     "%s.%s\n", oh->name, oc->clkdev_dev_id,
-                     oc->clkdev_con_id);
+                     "%s\n", oh->name, oc->clk);
                 if (IS_ERR(c))
                         ret = -EINVAL;
                 oc->_clk = c;
diff --git a/arch/arm/mach-omap2/omap_hwmod_2420.h b/arch/arm/mach-omap2/omap_hwmod_2420.h
index a9ca1b99a301..5932c1d3e07b 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2420.h
+++ b/arch/arm/mach-omap2/omap_hwmod_2420.h
@@ -117,8 +117,7 @@ static struct omap_hwmod_ocp_if *omap2420_mpu_masters[] = {
 /* MPU */
 static struct omap_hwmod omap2420_mpu_hwmod = {
         .name           = "mpu_hwmod",
-        .clkdev_dev_id  = NULL,
-        .clkdev_con_id  = "mpu_ck",
+        .main_clk       = "mpu_ck",
         .masters        = omap2420_mpu_masters,
         .masters_cnt    = ARRAY_SIZE(omap2420_mpu_masters),
         .omap_chip      = OMAP_CHIP_INIT(CHIP_IS_OMAP2420),
diff --git a/arch/arm/mach-omap2/omap_hwmod_2430.h b/arch/arm/mach-omap2/omap_hwmod_2430.h
index 59a208bea6c2..91f79c05a98c 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2430.h
+++ b/arch/arm/mach-omap2/omap_hwmod_2430.h
@@ -119,8 +119,7 @@ static struct omap_hwmod_ocp_if *omap2430_mpu_masters[] = {
 /* MPU */
 static struct omap_hwmod omap2430_mpu_hwmod = {
         .name           = "mpu_hwmod",
-        .clkdev_dev_id  = NULL,
-        .clkdev_con_id  = "mpu_ck",
+        .main_clk       = "mpu_ck",
         .masters        = omap2430_mpu_masters,
         .masters_cnt    = ARRAY_SIZE(omap2430_mpu_masters),
         .omap_chip      = OMAP_CHIP_INIT(CHIP_IS_OMAP2430),
diff --git a/arch/arm/mach-omap2/omap_hwmod_34xx.h b/arch/arm/mach-omap2/omap_hwmod_34xx.h
index 2e629dcb2fb1..26991147d5ee 100644
--- a/arch/arm/mach-omap2/omap_hwmod_34xx.h
+++ b/arch/arm/mach-omap2/omap_hwmod_34xx.h
@@ -143,8 +143,7 @@ static struct omap_hwmod_ocp_if *omap34xx_mpu_masters[] = {
 /* MPU */
 static struct omap_hwmod omap34xx_mpu_hwmod = {
         .name           = "mpu_hwmod",
-        .clkdev_dev_id  = NULL,
-        .clkdev_con_id  = "arm_fck",
+        .main_clk       = "arm_fck",
         .masters        = omap34xx_mpu_masters,
         .masters_cnt    = ARRAY_SIZE(omap34xx_mpu_masters),
         .omap_chip      = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),