4 files changed, 28 insertions, 30 deletions

diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index 5407b9549150..180f675c9064 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -111,7 +111,7 @@ static void omap2_clk_fixed_enable(struct clk *clk)
 /* Enables clock without considering parent dependencies or use count
  * REVISIT: Maybe change this to use clk->enable like on omap1?
  */
-static int omap2_clk_enable(struct clk * clk)
+static int _omap2_clk_enable(struct clk * clk)
 {
         u32 regval32;
 
@@ -150,7 +150,7 @@ static void omap2_clk_fixed_disable(struct clk *clk)
 }
 
 /* Disables clock without considering parent dependencies or use count */
-static void omap2_clk_disable(struct clk *clk)
+static void _omap2_clk_disable(struct clk *clk)
 {
         u32 regval32;
 
@@ -167,23 +167,23 @@ static void omap2_clk_disable(struct clk *clk)
         __raw_writel(regval32, clk->enable_reg);
 }
 
-static int omap2_clk_use(struct clk *clk)
+static int omap2_clk_enable(struct clk *clk)
 {
         int ret = 0;
 
         if (clk->usecount++ == 0) {
                 if (likely((u32)clk->parent))
-                        ret = omap2_clk_use(clk->parent);
+                        ret = omap2_clk_enable(clk->parent);
 
                 if (unlikely(ret != 0)) {
                         clk->usecount--;
                         return ret;
                 }
 
-                ret = omap2_clk_enable(clk);
+                ret = _omap2_clk_enable(clk);
 
                 if (unlikely(ret != 0) && clk->parent) {
-                        omap2_clk_unuse(clk->parent);
+                        omap2_clk_disable(clk->parent);
                         clk->usecount--;
                 }
         }
@@ -191,12 +191,12 @@ static int omap2_clk_use(struct clk *clk)
         return ret;
 }
 
-static void omap2_clk_unuse(struct clk *clk)
+static void omap2_clk_disable(struct clk *clk)
 {
         if (clk->usecount > 0 && !(--clk->usecount)) {
-                omap2_clk_disable(clk);
+                _omap2_clk_disable(clk);
                 if (likely((u32)clk->parent))
-                        omap2_clk_unuse(clk->parent);
+                        omap2_clk_disable(clk->parent);
         }
 }
 
@@ -873,7 +873,7 @@ static int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)
                 reg = (void __iomem *)src_sel;
 
                 if (clk->usecount > 0)
-                        omap2_clk_disable(clk);
+                        _omap2_clk_disable(clk);
 
                 /* Set new source value (previous dividers if any in effect) */
                 reg_val = __raw_readl(reg) & ~(field_mask << src_off);
@@ -884,7 +884,7 @@ static int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)
                         __raw_writel(0x1, (void __iomem *)&PRCM_CLKCFG_CTRL);
 
                 if (clk->usecount > 0)
-                        omap2_clk_enable(clk);
+                        _omap2_clk_enable(clk);
 
                 clk->parent = new_parent;
 
@@ -999,8 +999,6 @@ static int omap2_select_table_rate(struct clk * clk, unsigned long rate)
 static struct clk_functions omap2_clk_functions = {
         .clk_enable             = omap2_clk_enable,
         .clk_disable            = omap2_clk_disable,
-        .clk_use                = omap2_clk_use,
-        .clk_unuse              = omap2_clk_unuse,
         .clk_round_rate         = omap2_clk_round_rate,
         .clk_set_rate           = omap2_clk_set_rate,
         .clk_set_parent         = omap2_clk_set_parent,
@@ -1045,7 +1043,7 @@ static void __init omap2_disable_unused_clocks(void)
                         continue;
 
                 printk(KERN_INFO "Disabling unused clock \"%s\"\n", ck->name);
-                omap2_clk_disable(ck);
+                _omap2_clk_disable(ck);
         }
 }
 late_initcall(omap2_disable_unused_clocks);
@@ -1120,10 +1118,10 @@ int __init omap2_clk_init(void)
          * Only enable those clocks we will need, let the drivers
          * enable other clocks as necessary
          */
-        clk_use(&sync_32k_ick);
-        clk_use(&omapctrl_ick);
+        clk_enable(&sync_32k_ick);
+        clk_enable(&omapctrl_ick);
         if (cpu_is_omap2430())
-                clk_use(&sdrc_ick);
+                clk_enable(&sdrc_ick);
 
         return 0;
 }
diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h
index 4aeab5591bd3..6cab20b1d3c1 100644
--- a/arch/arm/mach-omap2/clock.h
+++ b/arch/arm/mach-omap2/clock.h
@@ -24,7 +24,7 @@ static void omap2_propagate_rate(struct clk * clk);
 static void omap2_mpu_recalc(struct clk * clk);
 static int omap2_select_table_rate(struct clk * clk, unsigned long rate);
 static long omap2_round_to_table_rate(struct clk * clk, unsigned long rate);
-static void omap2_clk_unuse(struct clk *clk);
+static void omap2_clk_disable(struct clk *clk);
 static void omap2_sys_clk_recalc(struct clk * clk);
 static u32 omap2_clksel_to_divisor(u32 div_sel, u32 field_val);
 static u32 omap2_clksel_get_divisor(struct clk *clk);
@@ -859,7 +859,7 @@ static struct clk core_l3_ck = {	/* Used for ick and fck, interconnect */
 
 static struct clk usb_l4_ick = {        /* FS-USB interface clock */
         .name           = "usb_l4_ick",
-        .parent         = &core_ck,
+        .parent         = &core_l3_ck,
         .flags          = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |
                                 RATE_CKCTL | CM_CORE_SEL1 | DELAYED_APP |
                                 CONFIG_PARTICIPANT,
@@ -1045,7 +1045,7 @@ static struct clk gpt1_ick = {
         .name           = "gpt1_ick",
         .parent         = &l4_ck,
         .flags          = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,
-        .enable_reg     = (void __iomem *)&CM_ICLKEN_WKUP,      /* Bit4 */
+        .enable_reg     = (void __iomem *)&CM_ICLKEN_WKUP,      /* Bit0 */
         .enable_bit     = 0,
         .recalc         = &omap2_followparent_recalc,
 };
@@ -1055,7 +1055,7 @@ static struct clk gpt1_fck = {
         .parent         = &func_32k_ck,
         .flags          = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X |
                                 CM_WKUP_SEL1,
-        .enable_reg     = (void __iomem *)&CM_FCLKEN_WKUP,
+        .enable_reg     = (void __iomem *)&CM_FCLKEN_WKUP,      /* Bit0 */
         .enable_bit     = 0,
         .src_offset     = 0,
         .recalc         = &omap2_followparent_recalc,
@@ -1065,7 +1065,7 @@ static struct clk gpt2_ick = {
         .name           = "gpt2_ick",
         .parent         = &l4_ck,
         .flags          = CLOCK_IN_OMAP242X | CLOCK_IN_OMAP243X,
-        .enable_reg     = (void __iomem *)&CM_ICLKEN1_CORE,     /* bit4 */
+        .enable_reg     = (void __iomem *)&CM_ICLKEN1_CORE,     /* Bit4 */
         .enable_bit     = 0,
         .recalc         = &omap2_followparent_recalc,
 };
@@ -1839,7 +1839,7 @@ static struct clk usb_fck = {
 
 static struct clk usbhs_ick = {
         .name           = "usbhs_ick",
-        .parent         = &l4_ck,
+        .parent         = &core_l3_ck,
         .flags          = CLOCK_IN_OMAP243X,
         .enable_reg     = (void __iomem *)&CM_ICLKEN2_CORE,
         .enable_bit     = 6,
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index e1bd46a96e11..24dd374224af 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -119,14 +119,14 @@ void __init omap_serial_init()
                         if (IS_ERR(uart1_ick))
                                 printk("Could not get uart1_ick\n");
                         else {
-                                clk_use(uart1_ick);
+                                clk_enable(uart1_ick);
                         }
 
                         uart1_fck = clk_get(NULL, "uart1_fck");
                         if (IS_ERR(uart1_fck))
                                 printk("Could not get uart1_fck\n");
                         else {
-                                clk_use(uart1_fck);
+                                clk_enable(uart1_fck);
                         }
                         break;
                 case 1:
@@ -134,14 +134,14 @@ void __init omap_serial_init()
                         if (IS_ERR(uart2_ick))
                                 printk("Could not get uart2_ick\n");
                         else {
-                                clk_use(uart2_ick);
+                                clk_enable(uart2_ick);
                         }
 
                         uart2_fck = clk_get(NULL, "uart2_fck");
                         if (IS_ERR(uart2_fck))
                                 printk("Could not get uart2_fck\n");
                         else {
-                                clk_use(uart2_fck);
+                                clk_enable(uart2_fck);
                         }
                         break;
                 case 2:
@@ -149,14 +149,14 @@ void __init omap_serial_init()
                         if (IS_ERR(uart3_ick))
                                 printk("Could not get uart3_ick\n");
                         else {
-                                clk_use(uart3_ick);
+                                clk_enable(uart3_ick);
                         }
 
                         uart3_fck = clk_get(NULL, "uart3_fck");
                         if (IS_ERR(uart3_fck))
                                 printk("Could not get uart3_fck\n");
                         else {
-                                clk_use(uart3_fck);
+                                clk_enable(uart3_fck);
                         }
                         break;
                 }
diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c
index 23d36b1c40fe..1d2f5ac2f69b 100644
--- a/arch/arm/mach-omap2/timer-gp.c
+++ b/arch/arm/mach-omap2/timer-gp.c
@@ -104,7 +104,7 @@ static void __init omap2_gp_timer_init(void)
         if (IS_ERR(sys_ck))
                 printk(KERN_ERR "Could not get sys_ck\n");
         else {
-                clk_use(sys_ck);
+                clk_enable(sys_ck);
                 tick_period = clk_get_rate(sys_ck) / 100;
                 clk_put(sys_ck);
         }