mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-13 22:25:03 +00:00
Code Issues Releases Wiki Activity

[ARM] Orion: support D0 5281 silicon

Browse source 
On D0 5281 SoCs, we need to disable the wait-for-interrupt
instruction due to an erratum.

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Acked-by: Martin Michlmayr <tbm@cyrius.com>
This commit is contained in:
Lennert Buytenhek 2008-08-09 15:17:27 +02:00 committed by Lennert Buytenhek
parent 6f088f1d21
commit ce72e36ed1
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
arch/arm/mach-orion5x/common.c
View file

@ -382,6 +382,8 @@ static void __init orion5x_id(u32 *dev, u32 *rev, char **dev_name)
*dev_name = "MV88F5281-D2"; *dev_name = "MV88F5281-D2";
} else if (*rev == MV88F5281_REV_D1) { } else if (*rev == MV88F5281_REV_D1) {
*dev_name = "MV88F5281-D1"; *dev_name = "MV88F5281-D1";
} else if (*rev == MV88F5281_REV_D0) {
*dev_name = "MV88F5281-D0";
} else { } else {
*dev_name = "MV88F5281-Rev-Unsupported"; *dev_name = "MV88F5281-Rev-Unsupported";
} }
@ -416,6 +418,15 @@ void __init orion5x_init(void)
* Setup Orion address map * Setup Orion address map
*/ */
orion5x_setup_cpu_mbus_bridge(); orion5x_setup_cpu_mbus_bridge();
/*
* Don't issue "Wait for Interrupt" instruction if we are
* running on D0 5281 silicon.
*/
if (dev == MV88F5281_DEV_ID && rev == MV88F5281_REV_D0) {
printk(KERN_INFO "Orion: Applying 5281 D0 WFI workaround.\n");
disable_hlt();
}
} }
/* /*

1
arch/arm/mach-orion5x/include/mach/orion5x.h
View file

@ -73,6 +73,7 @@
#define MV88F5182_REV_A2 2 #define MV88F5182_REV_A2 2
/* Orion-2 (88F5281) */ /* Orion-2 (88F5281) */
#define MV88F5281_DEV_ID 0x5281 #define MV88F5281_DEV_ID 0x5281
#define MV88F5281_REV_D0 4
#define MV88F5281_REV_D1 5 #define MV88F5281_REV_D1 5
#define MV88F5281_REV_D2 6 #define MV88F5281_REV_D2 6