summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/pm-rcar-gen2.c
diff options
context:
space:
mode:
authorSimon Horman <horms+renesas@verge.net.au>2016-06-29 14:41:43 +0200
committerSimon Horman <horms+renesas@verge.net.au>2016-06-29 14:41:43 +0200
commitf0aa411de83c096e09cf46b9ea0d68a1eeab4863 (patch)
tree15b696af2c76f49abb9f02cb064f1b55e83cc7e5 /arch/arm/mach-shmobile/pm-rcar-gen2.c
parentc94bc815f3c757df402d6f6a3e8d855b9168e6af (diff)
parentced42730d19dd140a76f86c3761f646b83a35d09 (diff)
downloadlinux-f0aa411de83c096e09cf46b9ea0d68a1eeab4863.tar.bz2
Merge branch 'rcar-sysc-for-v4.8' into HEAD
Diffstat (limited to 'arch/arm/mach-shmobile/pm-rcar-gen2.c')
-rw-r--r--arch/arm/mach-shmobile/pm-rcar-gen2.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-shmobile/pm-rcar-gen2.c b/arch/arm/mach-shmobile/pm-rcar-gen2.c
index 61361dac6068..dd9ac366868f 100644
--- a/arch/arm/mach-shmobile/pm-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/pm-rcar-gen2.c
@@ -36,11 +36,7 @@
static void __init rcar_gen2_sysc_init(u32 syscier)
{
- void __iomem *base = rcar_sysc_init(0xe6180000);
-
- /* enable all interrupt sources, but do not use interrupt handler */
- iowrite32(syscier, base + SYSCIER);
- iowrite32(0, base + SYSCIMR);
+ rcar_sysc_init(0xe6180000, syscier);
}
#else /* CONFIG_SMP */