| Message ID | 1370538046-1186-1-git-send-email-nschichan@freebox.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Jun 06, 2013 at 07:00:46PM +0200, Nicolas Schichan wrote: > 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> > --- > 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.
diff --git a/arch/arm/mach-kirkwood/mpp.c b/arch/arm/mach-kirkwood/mpp.c index 827cde4..e96fd71 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) 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)
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> --- arch/arm/mach-kirkwood/mpp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)