ARM: Kirkwood: handle mv88f6282 cpu in __kirkwood_variant().
Subsystems (2)
PATCH 1/1 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.
--- arch/arm/mach-kirkwood/mpp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/arm/mach-kirkwood/mpp.c +3 -2
@@ -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 )
Signature · 1 line
1.7.10.4
Jason Cooper
AppliedPATCH 1/1 ARM: Kirkwood: handle mv88f6282 cpu in __kirkwood_variant().
Quoted 11 lines · Nicolas Schichan
MPP_F6281_MASKwould 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 <[email protected]>--- arch/arm/mach-kirkwood/mpp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Applied to mvebu/fixes with Cc: to -stable for v3.9 and newer.
thx,
Jason.