diff options
| author | Nicolas Schichan <nschichan@freebox.fr> | 2013-06-06 13:00:46 -0400 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2013-06-06 14:16:04 -0400 |
| commit | 4089fe95bfed295c8ad38251d5fe02b6b0ba684c (patch) | |
| tree | 758668ffe079609b2fe429766da93c495388e61b /arch | |
| parent | b60b61d41220c8d34e2c62a748bc78bc5d40585e (diff) | |
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: Nicolas Schichan <nschichan@freebox.fr>
Cc: <stable@vger.kernel.org> # v3.9.x
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-kirkwood/mpp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-kirkwood/mpp.c b/arch/arm/mach-kirkwood/mpp.c index 827cde42414f..e96fd71abd76 100644 --- a/arch/arm/mach-kirkwood/mpp.c +++ b/arch/arm/mach-kirkwood/mpp.c | |||
| @@ -22,9 +22,10 @@ static unsigned int __init kirkwood_variant(void) | |||
| 22 | 22 | ||
| 23 | kirkwood_pcie_id(&dev, &rev); | 23 | kirkwood_pcie_id(&dev, &rev); |
| 24 | 24 | ||
| 25 | if ((dev == MV88F6281_DEV_ID && rev >= MV88F6281_REV_A0) || | 25 | if (dev == MV88F6281_DEV_ID && rev >= MV88F6281_REV_A0) |
| 26 | (dev == MV88F6282_DEV_ID)) | ||
| 27 | return MPP_F6281_MASK; | 26 | return MPP_F6281_MASK; |
| 27 | if (dev == MV88F6282_DEV_ID) | ||
| 28 | return MPP_F6282_MASK; | ||
| 28 | if (dev == MV88F6192_DEV_ID && rev >= MV88F6192_REV_A0) | 29 | if (dev == MV88F6192_DEV_ID && rev >= MV88F6192_REV_A0) |
| 29 | return MPP_F6192_MASK; | 30 | return MPP_F6192_MASK; |
| 30 | if (dev == MV88F6180_DEV_ID) | 31 | if (dev == MV88F6180_DEV_ID) |