diff options
| author | Martin Michlmayr <tbm@cyrius.com> | 2011-11-03 12:57:43 +0000 |
|---|---|---|
| committer | Nicolas Pitre <nico@fluxnic.net> | 2011-12-13 18:41:09 -0500 |
| commit | a87d89e74f0a4b56eaee8c3ef74bce69277b780f (patch) | |
| tree | 79d8d023446aabbfe04495e15cf1f7629b14a625 /arch/arm/mach-kirkwood | |
| parent | dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff) | |
| download | linux-a87d89e74f0a4b56eaee8c3ef74bce69277b780f.tar.gz linux-a87d89e74f0a4b56eaee8c3ef74bce69277b780f.tar.bz2 linux-a87d89e74f0a4b56eaee8c3ef74bce69277b780f.zip | |
ARM: Kirkwood: Recognize A1 revision of 6282 chip
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>
Diffstat (limited to 'arch/arm/mach-kirkwood')
| -rw-r--r-- | arch/arm/mach-kirkwood/common.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-kirkwood/include/mach/kirkwood.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index f3248cfbe51d..b9632ee57b06 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c @@ -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 { diff --git a/arch/arm/mach-kirkwood/include/mach/kirkwood.h b/arch/arm/mach-kirkwood/include/mach/kirkwood.h index 010bdeb4ac5f..fede3d503efa 100644 --- a/arch/arm/mach-kirkwood/include/mach/kirkwood.h +++ b/arch/arm/mach-kirkwood/include/mach/kirkwood.h @@ -135,4 +135,5 @@ #define MV88F6282_DEV_ID 0x6282 #define MV88F6282_REV_A0 0 +#define MV88F6282_REV_A1 1 #endif |