From: Martin Michlmayr Date: Thu, 3 Nov 2011 12:57:43 +0000 (+0000) Subject: ARM: Kirkwood: Recognize A1 revision of 6282 chip X-Git-Tag: v3.3-rc1~139^2~5^2~5 X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=a87d89e74f0a4b56eaee8c3ef74bce69277b780f;p=~andy%2Flinux 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 Acked-by: Lennert Buytenhek Signed-off-by: Nicolas Pitre --- diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index f3248cfbe51..b9632ee57b0 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 010bdeb4ac5..fede3d503ef 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