diff --git a/debian/changelog b/debian/changelog index 17b92fa0f..dc1bc6dce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,7 @@ linux-2.6 (3.2.1-1~experimental.1) UNRELEASED; urgency=low * [arm] backport topdown mmap support from rmk's tree * [armel] Enable support from LaCIE kirkwood devices, thanks to Simon Guinot (Closes: #655344) + * [armel] Backport 88f6282 A1 support -- Ben Hutchings Mon, 02 Jan 2012 02:55:28 +0000 diff --git a/debian/patches/features/arm/ARM-kirkwood-6282A1.patch b/debian/patches/features/arm/ARM-kirkwood-6282A1.patch new file mode 100644 index 000000000..1bb69cc46 --- /dev/null +++ b/debian/patches/features/arm/ARM-kirkwood-6282A1.patch @@ -0,0 +1,36 @@ +commit a87d89e74f0a4b56eaee8c3ef74bce69277b780f +Author: Martin Michlmayr +Date: Thu Nov 3 12:57:43 2011 +0000 + + 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 f3248cf..b9632ee 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 010bdeb..fede3d5 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 diff --git a/debian/patches/series/base b/debian/patches/series/base index 7d410ead6..0199cdcbe 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -62,3 +62,4 @@ + bugfix/arm/ARM-ixp4xx-gpiolib-support.patch + bugfix/arm/ARM-topdown-mmap.patch + bugfix/alpha/alpha-add-io-read-write-16-32-be-functions.patch ++ features/arm/ARM-kirkwood-6282A1.patch