Skip to content

Commit 4089fe9

Browse files
nschichanJason Cooper
authored andcommitted
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 830f8b9 (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 <[email protected]> Cc: <[email protected]> # v3.9.x Signed-off-by: Jason Cooper <[email protected]>
1 parent b60b61d commit 4089fe9

File tree

1 file changed

+3
-2
lines changed
  • arch/arm/mach-kirkwood

1 file changed

+3
-2
lines changed

arch/arm/mach-kirkwood/mpp.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ static unsigned int __init kirkwood_variant(void)
2222

2323
kirkwood_pcie_id(&dev, &rev);
2424

25-
if ((dev == MV88F6281_DEV_ID && rev >= MV88F6281_REV_A0) ||
26-
(dev == MV88F6282_DEV_ID))
25+
if (dev == MV88F6281_DEV_ID && rev >= MV88F6281_REV_A0)
2726
return MPP_F6281_MASK;
27+
if (dev == MV88F6282_DEV_ID)
28+
return MPP_F6282_MASK;
2829
if (dev == MV88F6192_DEV_ID && rev >= MV88F6192_REV_A0)
2930
return MPP_F6192_MASK;
3031
if (dev == MV88F6180_DEV_ID)

0 commit comments

Comments
 (0)