]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
OMAP2 clock: APLL code shouldn't rely on static clocks in its local namespace
authorPaul Walmsley <paul@pwsan.com>
Tue, 8 Dec 2009 23:18:46 +0000 (16:18 -0700)
committerpaul <paul@twilight.(none)>
Fri, 11 Dec 2009 23:12:11 +0000 (16:12 -0700)
Similar to the previous patch, the APLL code relied on the presence of the
static struct clks in its own namespace.  The APLL code didn't use them for
validation, however - it adjusted its own internal state depending on
the struct clk * that called it.  Now that static struct clks are
leaving the clock24xx.c namespace, use a more durable method: split the
omap2_clk_fixed_enable() function into omap2_clk_apll96_enable() and
omap2_clk_apll54_enable().  They still share a disable function.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
arch/arm/mach-omap2/clock24xx.c
arch/arm/mach-omap2/clock24xx.h

index 8ecd1751a3d8fd52fe266f58973c69559735e2c2..e60d1c094a04f410928494b22aa046c71b442de3 100644 (file)
@@ -42,7 +42,8 @@
 #include "cm-regbits-24xx.h"
 
 static const struct clkops clkops_oscck;
-static const struct clkops clkops_fixed;
+static const struct clkops clkops_apll96;
+static const struct clkops clkops_apll54;
 
 static void omap2430_clk_i2chs_find_idlest(struct clk *clk,
                                           void __iomem **idlest_reg,
@@ -338,7 +339,7 @@ static void omap2_sys_clk_recalc(struct clk * clk)
 #endif /* OLD_CK */
 
 /* Enable an APLL if off */
-static int omap2_clk_fixed_enable(struct clk *clk)
+static int omap2_clk_apll_enable(struct clk *clk, u32 status_mask)
 {
        u32 cval, apll_mask;
 
@@ -353,12 +354,7 @@ static int omap2_clk_fixed_enable(struct clk *clk)
        cval |= apll_mask;
        cm_write_mod_reg(cval, PLL_MOD, CM_CLKEN);
 
-       if (clk == &apll96_ck)
-               cval = OMAP24XX_ST_96M_APLL;
-       else if (clk == &apll54_ck)
-               cval = OMAP24XX_ST_54M_APLL;
-
-       omap2_cm_wait_idlest(OMAP_CM_REGADDR(PLL_MOD, CM_IDLEST), cval,
+       omap2_cm_wait_idlest(OMAP_CM_REGADDR(PLL_MOD, CM_IDLEST), status_mask,
                             clk->name);
 
        /*
@@ -368,8 +364,18 @@ static int omap2_clk_fixed_enable(struct clk *clk)
        return 0;
 }
 
+static int omap2_clk_apll96_enable(struct clk *clk)
+{
+       return omap2_clk_apll_enable(clk, OMAP24XX_ST_96M_APLL);
+}
+
+static int omap2_clk_apll54_enable(struct clk *clk)
+{
+       return omap2_clk_apll_enable(clk, OMAP24XX_ST_54M_APLL);
+}
+
 /* Stop APLL */
-static void omap2_clk_fixed_disable(struct clk *clk)
+static void omap2_clk_apll_disable(struct clk *clk)
 {
        u32 cval;
 
@@ -378,9 +384,14 @@ static void omap2_clk_fixed_disable(struct clk *clk)
        cm_write_mod_reg(cval, PLL_MOD, CM_CLKEN);
 }
 
-static const struct clkops clkops_fixed = {
-       .enable         = &omap2_clk_fixed_enable,
-       .disable        = &omap2_clk_fixed_disable,
+static const struct clkops clkops_apll96 = {
+       .enable         = &omap2_clk_apll96_enable,
+       .disable        = &omap2_clk_apll_disable,
+};
+
+static const struct clkops clkops_apll54 = {
+       .enable         = &omap2_clk_apll54_enable,
+       .disable        = &omap2_clk_apll_disable,
 };
 
 /*
index d19cf7a7d8db36ef7045edb601b65361709c4ddd..21238d18fc80a095192074eb587f6dc991903b41 100644 (file)
@@ -708,7 +708,7 @@ static struct clk dpll_ck = {
 
 static struct clk apll96_ck = {
        .name           = "apll96_ck",
-       .ops            = &clkops_fixed,
+       .ops            = &clkops_apll96,
        .parent         = &sys_ck,
        .rate           = 96000000,
        .flags          = RATE_FIXED | ENABLE_ON_INIT,
@@ -719,7 +719,7 @@ static struct clk apll96_ck = {
 
 static struct clk apll54_ck = {
        .name           = "apll54_ck",
-       .ops            = &clkops_fixed,
+       .ops            = &clkops_apll54,
        .parent         = &sys_ck,
        .rate           = 54000000,
        .flags          = RATE_FIXED | ENABLE_ON_INIT,