diff options
Diffstat (limited to 'arch/arm/mach-omap2/cm44xx.c')
-rw-r--r-- | arch/arm/mach-omap2/cm44xx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/cm44xx.c b/arch/arm/mach-omap2/cm44xx.c index 535d66e2822c..30b6d9743b73 100644 --- a/arch/arm/mach-omap2/cm44xx.c +++ b/arch/arm/mach-omap2/cm44xx.c | |||
@@ -30,23 +30,23 @@ | |||
30 | /* Read a register in CM1 */ | 30 | /* Read a register in CM1 */ |
31 | u32 omap4_cm1_read_inst_reg(s16 inst, u16 reg) | 31 | u32 omap4_cm1_read_inst_reg(s16 inst, u16 reg) |
32 | { | 32 | { |
33 | return __raw_readl(OMAP44XX_CM1_REGADDR(inst, reg)); | 33 | return readl_relaxed(OMAP44XX_CM1_REGADDR(inst, reg)); |
34 | } | 34 | } |
35 | 35 | ||
36 | /* Write into a register in CM1 */ | 36 | /* Write into a register in CM1 */ |
37 | void omap4_cm1_write_inst_reg(u32 val, s16 inst, u16 reg) | 37 | void omap4_cm1_write_inst_reg(u32 val, s16 inst, u16 reg) |
38 | { | 38 | { |
39 | __raw_writel(val, OMAP44XX_CM1_REGADDR(inst, reg)); | 39 | writel_relaxed(val, OMAP44XX_CM1_REGADDR(inst, reg)); |
40 | } | 40 | } |
41 | 41 | ||
42 | /* Read a register in CM2 */ | 42 | /* Read a register in CM2 */ |
43 | u32 omap4_cm2_read_inst_reg(s16 inst, u16 reg) | 43 | u32 omap4_cm2_read_inst_reg(s16 inst, u16 reg) |
44 | { | 44 | { |
45 | return __raw_readl(OMAP44XX_CM2_REGADDR(inst, reg)); | 45 | return readl_relaxed(OMAP44XX_CM2_REGADDR(inst, reg)); |
46 | } | 46 | } |
47 | 47 | ||
48 | /* Write into a register in CM2 */ | 48 | /* Write into a register in CM2 */ |
49 | void omap4_cm2_write_inst_reg(u32 val, s16 inst, u16 reg) | 49 | void omap4_cm2_write_inst_reg(u32 val, s16 inst, u16 reg) |
50 | { | 50 | { |
51 | __raw_writel(val, OMAP44XX_CM2_REGADDR(inst, reg)); | 51 | writel_relaxed(val, OMAP44XX_CM2_REGADDR(inst, reg)); |
52 | } | 52 | } |