mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-06 10:57:46 +00:00
Code Issues Releases Wiki Activity

ARM: OMAP4: PM: Modify Clock-domain interfaces for OMAP4 compatibility.

Browse source 
Here the APIs are modified to use absolute addresses instead of module offsets.

Signed-off-by: Abhijit Pagare <abhijitpagare@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Benoit Cousson <b-cousson@ti.com>
Cc: Rajendra Nayak <rnayak@ti.com>
This commit is contained in:
Abhijit Pagare 2010-01-26 20:12:53 -07:00 committed by Paul Walmsley
parent 84c0c39aec
commit b099474aa4
1 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
arch/arm/mach-omap2/clockdomain.c
View file

@ -145,25 +145,29 @@ static void _clkdm_del_autodeps(struct clockdomain *clkdm)
*/ */
static void _omap2_clkdm_set_hwsup(struct clockdomain *clkdm, int enable) static void _omap2_clkdm_set_hwsup(struct clockdomain *clkdm, int enable)
{ {
u32 v; u32 bits, v;
if (cpu_is_omap24xx()) { if (cpu_is_omap24xx()) {
if (enable) if (enable)
v = OMAP24XX_CLKSTCTRL_ENABLE_AUTO; bits = OMAP24XX_CLKSTCTRL_ENABLE_AUTO;
else else
v = OMAP24XX_CLKSTCTRL_DISABLE_AUTO; bits = OMAP24XX_CLKSTCTRL_DISABLE_AUTO;
} else if (cpu_is_omap34xx()) { } else if (cpu_is_omap34xx()) {
if (enable) if (enable)
v = OMAP34XX_CLKSTCTRL_ENABLE_AUTO; bits = OMAP34XX_CLKSTCTRL_ENABLE_AUTO;
else else
v = OMAP34XX_CLKSTCTRL_DISABLE_AUTO; bits = OMAP34XX_CLKSTCTRL_DISABLE_AUTO;
} else { } else {
BUG(); BUG();
} }
cm_rmw_mod_reg_bits(clkdm->clktrctrl_mask, bits = bits << __ffs(clkdm->clktrctrl_mask);
v << __ffs(clkdm->clktrctrl_mask),
clkdm->pwrdm.ptr->prcm_offs, OMAP2_CM_CLKSTCTRL); v = __raw_readl(clkdm->clkstctrl_reg);
v &= ~(clkdm->clktrctrl_mask);
v |= bits;
__raw_writel(v, clkdm->clkstctrl_reg);
} }
static struct clockdomain *_clkdm_lookup(const char *name) static struct clockdomain *_clkdm_lookup(const char *name)
@ -381,7 +385,7 @@ static int omap2_clkdm_clktrctrl_read(struct clockdomain *clkdm)
if (!clkdm) if (!clkdm)
return -EINVAL; return -EINVAL;
v = cm_read_mod_reg(clkdm->pwrdm.ptr->prcm_offs, OMAP2_CM_CLKSTCTRL); v = __raw_readl(clkdm->clkstctrl_reg);
v &= clkdm->clktrctrl_mask; v &= clkdm->clktrctrl_mask;
v >>= __ffs(clkdm->clktrctrl_mask); v >>= __ffs(clkdm->clktrctrl_mask);
@ -417,12 +421,13 @@ int omap2_clkdm_sleep(struct clockdomain *clkdm)
} else if (cpu_is_omap34xx()) { } else if (cpu_is_omap34xx()) {
u32 v = (OMAP34XX_CLKSTCTRL_FORCE_SLEEP << u32 bits = (OMAP34XX_CLKSTCTRL_FORCE_SLEEP <<
__ffs(clkdm->clktrctrl_mask)); __ffs(clkdm->clktrctrl_mask));
cm_rmw_mod_reg_bits(clkdm->clktrctrl_mask, v, u32 v = __raw_readl(clkdm->clkstctrl_reg);
clkdm->pwrdm.ptr->prcm_offs, v &= ~(clkdm->clktrctrl_mask);
OMAP2_CM_CLKSTCTRL); v |= bits;
__raw_writel(v, clkdm->clkstctrl_reg);
} else { } else {
BUG(); BUG();
@ -460,12 +465,13 @@ int omap2_clkdm_wakeup(struct clockdomain *clkdm)
} else if (cpu_is_omap34xx()) { } else if (cpu_is_omap34xx()) {
u32 v = (OMAP34XX_CLKSTCTRL_FORCE_WAKEUP << u32 bits = (OMAP34XX_CLKSTCTRL_FORCE_WAKEUP <<
__ffs(clkdm->clktrctrl_mask)); __ffs(clkdm->clktrctrl_mask));
cm_rmw_mod_reg_bits(clkdm->clktrctrl_mask, v, u32 v = __raw_readl(clkdm->clkstctrl_reg);
clkdm->pwrdm.ptr->prcm_offs, v &= ~(clkdm->clktrctrl_mask);
OMAP2_CM_CLKSTCTRL); v |= bits;
__raw_writel(v, clkdm->clkstctrl_reg);
} else { } else {
BUG(); BUG();
@ -561,7 +567,7 @@ int omap2_clkdm_clk_enable(struct clockdomain *clkdm, struct clk *clk)
* downstream clocks for debugging purposes? * downstream clocks for debugging purposes?
*/ */
if (!clkdm || !clk || !clkdm->clktrctrl_mask) if (!clkdm || !clk || !clkdm->clkstctrl_reg)
return -EINVAL; return -EINVAL;
if (atomic_inc_return(&clkdm->usecount) > 1) if (atomic_inc_return(&clkdm->usecount) > 1)
@ -612,7 +618,7 @@ int omap2_clkdm_clk_disable(struct clockdomain *clkdm, struct clk *clk)
* downstream clocks for debugging purposes? * downstream clocks for debugging purposes?
*/ */
if (!clkdm || !clk || !clkdm->clktrctrl_mask) if (!clkdm || !clk || !clkdm->clkstctrl_reg)
return -EINVAL; return -EINVAL;
#ifdef DEBUG #ifdef DEBUG