diff options
Diffstat (limited to 'arch/arm/mach-omap2/clkt2xxx_apll.c')
-rw-r--r-- | arch/arm/mach-omap2/clkt2xxx_apll.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/clkt2xxx_apll.c b/arch/arm/mach-omap2/clkt2xxx_apll.c index 954d11f37542..f51cffd1fc53 100644 --- a/arch/arm/mach-omap2/clkt2xxx_apll.c +++ b/arch/arm/mach-omap2/clkt2xxx_apll.c | |||
@@ -49,14 +49,14 @@ static int omap2_clk_apll_enable(struct clk *clk, u32 status_mask) | |||
49 | 49 | ||
50 | apll_mask = EN_APLL_LOCKED << clk->enable_bit; | 50 | apll_mask = EN_APLL_LOCKED << clk->enable_bit; |
51 | 51 | ||
52 | cval = cm_read_mod_reg(PLL_MOD, CM_CLKEN); | 52 | cval = omap2_cm_read_mod_reg(PLL_MOD, CM_CLKEN); |
53 | 53 | ||
54 | if ((cval & apll_mask) == apll_mask) | 54 | if ((cval & apll_mask) == apll_mask) |
55 | return 0; /* apll already enabled */ | 55 | return 0; /* apll already enabled */ |
56 | 56 | ||
57 | cval &= ~apll_mask; | 57 | cval &= ~apll_mask; |
58 | cval |= apll_mask; | 58 | cval |= apll_mask; |
59 | cm_write_mod_reg(cval, PLL_MOD, CM_CLKEN); | 59 | omap2_cm_write_mod_reg(cval, PLL_MOD, CM_CLKEN); |
60 | 60 | ||
61 | omap2_cm_wait_idlest(cm_idlest_pll, status_mask, | 61 | omap2_cm_wait_idlest(cm_idlest_pll, status_mask, |
62 | OMAP24XX_CM_IDLEST_VAL, clk->name); | 62 | OMAP24XX_CM_IDLEST_VAL, clk->name); |
@@ -83,9 +83,9 @@ static void omap2_clk_apll_disable(struct clk *clk) | |||
83 | { | 83 | { |
84 | u32 cval; | 84 | u32 cval; |
85 | 85 | ||
86 | cval = cm_read_mod_reg(PLL_MOD, CM_CLKEN); | 86 | cval = omap2_cm_read_mod_reg(PLL_MOD, CM_CLKEN); |
87 | cval &= ~(EN_APLL_LOCKED << clk->enable_bit); | 87 | cval &= ~(EN_APLL_LOCKED << clk->enable_bit); |
88 | cm_write_mod_reg(cval, PLL_MOD, CM_CLKEN); | 88 | omap2_cm_write_mod_reg(cval, PLL_MOD, CM_CLKEN); |
89 | } | 89 | } |
90 | 90 | ||
91 | /* Public data */ | 91 | /* Public data */ |
@@ -106,7 +106,7 @@ u32 omap2xxx_get_apll_clkin(void) | |||
106 | { | 106 | { |
107 | u32 aplls, srate = 0; | 107 | u32 aplls, srate = 0; |
108 | 108 | ||
109 | aplls = cm_read_mod_reg(PLL_MOD, CM_CLKSEL1); | 109 | aplls = omap2_cm_read_mod_reg(PLL_MOD, CM_CLKSEL1); |
110 | aplls &= OMAP24XX_APLLS_CLKIN_MASK; | 110 | aplls &= OMAP24XX_APLLS_CLKIN_MASK; |
111 | aplls >>= OMAP24XX_APLLS_CLKIN_SHIFT; | 111 | aplls >>= OMAP24XX_APLLS_CLKIN_SHIFT; |
112 | 112 | ||