summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/prm44xx.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2017-06-12 13:27:30 +0300
committerTony Lindgren <tony@atomide.com>2017-06-12 13:27:30 +0300
commit67d00470accf5c58abbb23a44c867c5f15437976 (patch)
tree4141a408b08ec38c6d3cf0295641ce3e8a63182b /arch/arm/mach-omap2/prm44xx.c
parent018b732458ac39c4858d9840c0e32310bc0930dd (diff)
parent70f05be3213393f20f01e4d59625df7ee49fe32f (diff)
downloadlinux-67d00470accf5c58abbb23a44c867c5f15437976.tar.xz
Merge branch 'omap-for-v4.13/clkctrl' into omap-for-v4.13/soc-v4
Diffstat (limited to 'arch/arm/mach-omap2/prm44xx.c')
-rw-r--r--arch/arm/mach-omap2/prm44xx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c
index b045f974dc47..87e86a4a9ead 100644
--- a/arch/arm/mach-omap2/prm44xx.c
+++ b/arch/arm/mach-omap2/prm44xx.c
@@ -91,13 +91,13 @@ static struct prm_reset_src_map omap44xx_prm_reset_src_map[] = {
/* Read a register in a CM/PRM instance in the PRM module */
static u32 omap4_prm_read_inst_reg(s16 inst, u16 reg)
{
- return readl_relaxed(prm_base + inst + reg);
+ return readl_relaxed(prm_base.va + inst + reg);
}
/* Write into a register in a CM/PRM instance in the PRM module */
static void omap4_prm_write_inst_reg(u32 val, s16 inst, u16 reg)
{
- writel_relaxed(val, prm_base + inst + reg);
+ writel_relaxed(val, prm_base.va + inst + reg);
}
/* Read-modify-write a register in a PRM module. Caller must lock */