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

Commit 4089fe95 authored by Nicolas Schichan's avatar Nicolas Schichan Committed by Jason Cooper
Browse files

ARM: Kirkwood: handle mv88f6282 cpu in __kirkwood_variant(). 



MPP_F6281_MASK would be previously be returned when on mv88f6282,
which would disallow some valid MPP configurations.

Commit 830f8b91 (arm: plat-orion: fix printing of "MPP config
unavailable on this hardware") made this problem visible as an invalid
MPP configuration is now correctly detected and not applied.

Signed-off-by: default avatarNicolas Schichan <nschichan@freebox.fr>
Cc: <stable@vger.kernel.org> # v3.9.x
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent b60b61d4

arch/arm/mach-kirkwood/mpp.c

+3 −2
Original line number Diff line number Diff line
@@ -22,9 +22,10 @@ static unsigned int __init kirkwood_variant(void) 


	kirkwood_pcie_id(&dev, &rev);



	if ((dev == MV88F6281_DEV_ID && rev >= MV88F6281_REV_A0) ||

	    (dev == MV88F6282_DEV_ID))

	if (dev == MV88F6281_DEV_ID && rev >= MV88F6281_REV_A0)

		return MPP_F6281_MASK;

	if (dev == MV88F6282_DEV_ID)

		return MPP_F6282_MASK;

	if (dev == MV88F6192_DEV_ID && rev >= MV88F6192_REV_A0)

		return MPP_F6192_MASK;

	if (dev == MV88F6180_DEV_ID)