| Message ID | 1396278994-12624-2-git-send-email-t-kristo@ti.com |
|---|---|
| State | Accepted |
| Commit | cdb445147a4e45f716c078f78277ea6524b76dd0 |
| Headers | show |
On Mon, Mar 31, 2014 at 06:15:40PM +0300, Tero Kristo wrote: > OMAP44XX_CM*_REGADDR macros should be avoided, instead use the cm_base* > iomaps. > > Signed-off-by: Tero Kristo <t-kristo@ti.com> > --- > arch/arm/mach-omap2/cm44xx.c | 8 ++++---- > 1 file 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); should you use readl() or readl_relaxed() instead ? It'll take care of endianness, right ?
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); }
OMAP44XX_CM*_REGADDR macros should be avoided, instead use the cm_base* iomaps. Signed-off-by: Tero Kristo <t-kristo@ti.com> --- arch/arm/mach-omap2/cm44xx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)