diff options
| author | Tero Kristo | 2013-10-11 18:15:31 +0200 |
|---|---|---|
| committer | Paul Walmsley | 2013-10-19 18:11:51 +0200 |
| commit | cd6e9db27728e8bcf98cb667996b121761f58121 (patch) | |
| tree | fefd3a81cc6719f574471fe78c94e4b126b72c6a /arch/arm/mach-omap2/clkt2xxx_apll.c | |
| parent | Linux 3.12-rc4 (diff) | |
| download | kernel-qcow2-linux-cd6e9db27728e8bcf98cb667996b121761f58121.tar.gz kernel-qcow2-linux-cd6e9db27728e8bcf98cb667996b121761f58121.tar.xz kernel-qcow2-linux-cd6e9db27728e8bcf98cb667996b121761f58121.zip | |
ARM: OMAP2: CM/PM: remove direct register accesses outside CM code
Users of the CM funtionality should not access the CM registers directly
by themselves. Thus, added new CM driver APIs for the OMAP2 specific
functionalities which support the existing direct register accesses, and
changed the platform code to use these. This is done in preparation
for moving the CM code into its own individual driver.
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/clkt2xxx_apll.c')
| -rw-r--r-- | arch/arm/mach-omap2/clkt2xxx_apll.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/clkt2xxx_apll.c b/arch/arm/mach-omap2/clkt2xxx_apll.c index 25b1feed480d..c78e893eba7d 100644 --- a/arch/arm/mach-omap2/clkt2xxx_apll.c +++ b/arch/arm/mach-omap2/clkt2xxx_apll.c @@ -52,7 +52,7 @@ static bool omap2xxx_clk_apll_locked(struct clk_hw *hw) apll_mask = EN_APLL_LOCKED << clk->enable_bit; - r = omap2_cm_read_mod_reg(PLL_MOD, CM_CLKEN); + r = omap2xxx_cm_get_pll_status(); return ((r & apll_mask) == apll_mask) ? true : false; } @@ -126,7 +126,7 @@ u32 omap2xxx_get_apll_clkin(void) { u32 aplls, srate = 0; - aplls = omap2_cm_read_mod_reg(PLL_MOD, CM_CLKSEL1); + aplls = omap2xxx_cm_get_pll_config(); aplls &= OMAP24XX_APLLS_CLKIN_MASK; aplls >>= OMAP24XX_APLLS_CLKIN_SHIFT; |