Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdb44514 authored by Tero Kristo's avatar Tero Kristo Committed by Paul Walmsley
Browse files

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: default avatarTero Kristo <t-kristo@ti.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 7af13637

arch/arm/mach-omap2/cm44xx.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

}