aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clk
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-01-27 13:03:00 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2020-01-27 13:03:00 -0800
commit6a1000bd27035bba17ede9dc915166276a811edb (patch)
tree92389983cc8bd09ba5b1cdebabfcad882f8ce3f3 /drivers/clk
parentMerge tag 'for-5.6/libata-2020-01-27' of git://git.kernel.dk/linux-block (diff)
parentremove ioremap_nocache and devm_ioremap_nocache (diff)
downloadlinux-dev-6a1000bd27035bba17ede9dc915166276a811edb.tar.xz
linux-dev-6a1000bd27035bba17ede9dc915166276a811edb.zip
Merge tag 'ioremap-5.6' of git://git.infradead.org/users/hch/ioremap
Pull ioremap updates from Christoph Hellwig: "Remove the ioremap_nocache API (plus wrappers) that are always identical to ioremap" * tag 'ioremap-5.6' of git://git.infradead.org/users/hch/ioremap: remove ioremap_nocache and devm_ioremap_nocache MIPS: define ioremap_nocache to ioremap
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/renesas/clk-rz.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/renesas/clk-rz.c b/drivers/clk/renesas/clk-rz.c
index fbc34beafc78..7b703f14e20b 100644
--- a/drivers/clk/renesas/clk-rz.c
+++ b/drivers/clk/renesas/clk-rz.c
@@ -37,8 +37,8 @@ static u16 __init rz_cpg_read_mode_pins(void)
void __iomem *ppr0, *pibc0;
u16 modes;
- ppr0 = ioremap_nocache(PPR0, 2);
- pibc0 = ioremap_nocache(PIBC0, 2);
+ ppr0 = ioremap(PPR0, 2);
+ pibc0 = ioremap(PIBC0, 2);
BUG_ON(!ppr0 || !pibc0);
iowrite16(4, pibc0); /* enable input buffer */
modes = ioread16(ppr0);