summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorGregory CLEMENT <gregory.clement@free-electrons.com>2013-06-10 18:05:51 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-27 10:38:23 -0700
commit178dff24056a048259f8cc72fa47fdfbda5a95ee (patch)
tree34b08a52185258d177633b933a949cd22c4dc1dd /arch
parent688b92cf4ec673d6fffebf27ccfd1a867cf530c9 (diff)
ARM: 7754/1: Fix the CPU ID and the mask associated to the PJ4B
commit 049be07053ebbf0ee8543caea23ae7bdf0765bb2 upstream. This commit fixes the ID and mask for the PJ4B which was too restrictive and didn't match the CPU of the Armada 370 SoC. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Reviewed-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mm/proc-v7.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index f584d3f5b37c..77470d7e6375 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -407,8 +407,8 @@ __v7_ca9mp_proc_info:
*/
.type __v7_pj4b_proc_info, #object
__v7_pj4b_proc_info:
- .long 0x562f5840
- .long 0xfffffff0
+ .long 0x560f5800
+ .long 0xff0fff00
__v7_proc __v7_pj4b_setup
.size __v7_pj4b_proc_info, . - __v7_pj4b_proc_info
#endif /* CONFIG_ARM_LPAE */