diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2016-06-29 14:41:43 +0200 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2016-06-29 14:41:43 +0200 |
| commit | f0aa411de83c096e09cf46b9ea0d68a1eeab4863 (patch) | |
| tree | 15b696af2c76f49abb9f02cb064f1b55e83cc7e5 /arch/arm/mach-shmobile | |
| parent | c94bc815f3c757df402d6f6a3e8d855b9168e6af (diff) | |
| parent | ced42730d19dd140a76f86c3761f646b83a35d09 (diff) | |
| download | linux-f0aa411de83c096e09cf46b9ea0d68a1eeab4863.tar.gz linux-f0aa411de83c096e09cf46b9ea0d68a1eeab4863.tar.xz | |
Merge branch 'rcar-sysc-for-v4.8' into HEAD
Diffstat (limited to 'arch/arm/mach-shmobile')
| -rw-r--r-- | arch/arm/mach-shmobile/pm-r8a7779.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/pm-rcar-gen2.c | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/arch/arm/mach-shmobile/pm-r8a7779.c b/arch/arm/mach-shmobile/pm-r8a7779.c index 4174cbcbc467..5c9a93f5e650 100644 --- a/arch/arm/mach-shmobile/pm-r8a7779.c +++ b/arch/arm/mach-shmobile/pm-r8a7779.c @@ -23,11 +23,7 @@ static void __init r8a7779_sysc_init(void) { - void __iomem *base = rcar_sysc_init(0xffd85000); - - /* enable all interrupt sources, but do not use interrupt handler */ - iowrite32(0x0131000e, base + SYSCIER); - iowrite32(0, base + SYSCIMR); + rcar_sysc_init(0xffd85000, 0x0131000e); } #else /* CONFIG_PM || CONFIG_SMP */ 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 */ |