ARM: Kirkwood: Recognize A1 revision of 6282 chip
authorMartin Michlmayr <tbm@cyrius.com>
Thu, 3 Nov 2011 12:57:43 +0000 (12:57 +0000)
committerNicolas Pitre <nico@fluxnic.net>
Tue, 13 Dec 2011 23:41:09 +0000 (18:41 -0500)
Recognize the Kirkwood 6282 revision A1 chip since products using
this chip are shipping now, such as the QNAP TS-x19P II devices.

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Acked-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
arch/arm/mach-kirkwood/common.c
arch/arm/mach-kirkwood/include/mach/kirkwood.h

index f3248cfbe51d058f79812d5247125fc98c2c2af6..b9632ee57b06ad7853d9263fa1339412ab82ad92 100644 (file)
@@ -430,6 +430,8 @@ static char * __init kirkwood_id(void)
        } else if (dev == MV88F6282_DEV_ID) {
                if (rev == MV88F6282_REV_A0)
                        return "MV88F6282-Rev-A0";
+               else if (rev == MV88F6282_REV_A1)
+                       return "MV88F6282-Rev-A1";
                else
                        return "MV88F6282-Rev-Unsupported";
        } else {
index 010bdeb4ac5f193ebadf646dd0a099c35ec147e1..fede3d503efa0ef505b910494b4c96b5a9fa496d 100644 (file)
 
 #define MV88F6282_DEV_ID       0x6282
 #define MV88F6282_REV_A0       0
+#define MV88F6282_REV_A1       1
 #endif