ARM: 7233/1: ux500: remove overlapping iotable entries
authorLinus Walleij <linus.walleij@linaro.org>
Wed, 14 Dec 2011 17:15:42 +0000 (18:15 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 18 Dec 2011 23:02:56 +0000 (23:02 +0000)
commit215e83d971a04f04d191c7f702943412a19408fd
tree4e8d9ca52ce48e2fe0ecd3626809351f4415a9ec
parent2f0778afac79bd8d226225556858a636931eeabc
ARM: 7233/1: ux500: remove overlapping iotable entries

The overlapping iotable mapping entries for the ux500 Cortex
A9 SCU, CPU control and TWD are no longer accepted by the
kernel. Remove the overlaps so the machine boots again.

Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Cc: Rabin Vincent <rabin.vincent@stericsson.com>
Reported-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-ux500/cpu-db5500.c
arch/arm/mach-ux500/cpu-db8500.c