summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/cm44xx.c
diff options
context:
space:
mode:
authorTero Kristo <t-kristo@ti.com>2014-03-31 15:15:40 (GMT)
committerPaul Walmsley <paul@pwsan.com>2014-05-16 04:34:44 (GMT)
commitcdb445147a4e45f716c078f78277ea6524b76dd0 (patch)
tree17a6d6f663a0725c7bd40a31aa792648e418f3e7 /arch/arm/mach-omap2/cm44xx.c
parent7af1363742e0e2752e90d5de2ddb9c48665fc567 (diff)
downloadlinux-cdb445147a4e45f716c078f78277ea6524b76dd0.tar.xz
ARM: OMAP4: CM: use cm_base* in register address calculations
OMAP44XX_CM*_REGADDR macros should be avoided, instead use the cm_base* iomaps. Signed-off-by: Tero Kristo <t-kristo@ti.com> Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/cm44xx.c')
-rw-r--r--arch/arm/mach-omap2/cm44xx.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/cm44xx.c b/arch/arm/mach-omap2/cm44xx.c
index 535d66e..5627072 100644
--- a/arch/arm/mach-omap2/cm44xx.c
+++ b/arch/arm/mach-omap2/cm44xx.c
@@ -30,23 +30,23 @@
/* Read a register in CM1 */
u32 omap4_cm1_read_inst_reg(s16 inst, u16 reg)
{
- return __raw_readl(OMAP44XX_CM1_REGADDR(inst, reg));
+ return __raw_readl(cm_base + inst + reg);
}
/* Write into a register in CM1 */
void omap4_cm1_write_inst_reg(u32 val, s16 inst, u16 reg)
{
- __raw_writel(val, OMAP44XX_CM1_REGADDR(inst, reg));
+ __raw_writel(val, cm_base + inst + reg);
}
/* Read a register in CM2 */
u32 omap4_cm2_read_inst_reg(s16 inst, u16 reg)
{
- return __raw_readl(OMAP44XX_CM2_REGADDR(inst, reg));
+ return __raw_readl(cm2_base + inst + reg);
}
/* Write into a register in CM2 */
void omap4_cm2_write_inst_reg(u32 val, s16 inst, u16 reg)
{
- __raw_writel(val, OMAP44XX_CM2_REGADDR(inst, reg));
+ __raw_writel(val, cm2_base + inst + reg);
}