Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce72e36e authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Lennert Buytenhek
Browse files

[ARM] Orion: support D0 5281 silicon 



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

Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
Signed-off-by: default avatarNicolas Pitre <nico@marvell.com>
Acked-by: default avatarMartin Michlmayr <tbm@cyrius.com>
parent 6f088f1d

arch/arm/mach-orion5x/common.c

+11 −0
Original line number Diff line number Diff line
@@ -382,6 +382,8 @@ static void __init orion5x_id(u32 *dev, u32 *rev, char **dev_name) 
			*dev_name = "MV88F5281-D2";

		} else if (*rev == MV88F5281_REV_D1) {

			*dev_name = "MV88F5281-D1";

		} else if (*rev == MV88F5281_REV_D0) {

			*dev_name = "MV88F5281-D0";

		} else {

			*dev_name = "MV88F5281-Rev-Unsupported";

		}
@@ -416,6 +418,15 @@ void __init orion5x_init(void) 
	 * Setup Orion address map

	 */

	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();

	}

}



/*

arch/arm/mach-orion5x/include/mach/orion5x.h

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ 
#define MV88F5182_REV_A2	2

/* Orion-2 (88F5281) */

#define MV88F5281_DEV_ID	0x5281

#define MV88F5281_REV_D0	4

#define MV88F5281_REV_D1	5

#define MV88F5281_REV_D2	6