Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / arch / arm / mach-orion5x / ts78xx-fpga.h

diff --git a/arch/arm/mach-orion5x/ts78xx-fpga.h b/arch/arm/mach-orion5x/ts78xx-fpga.h
index 37b3d48..151e89e 100644 (file)
--- a/arch/arm/mach-orion5x/ts78xx-fpga.h
+++ b/arch/arm/mach-orion5x/ts78xx-fpga.h
@@ -1,3 +1,4 @@
+#define TS7800_FPGA_MAGIC 0x00b480
 #define FPGAID(_magic, _rev) ((_magic << 8) + _rev)
 
 /*
@@ -6,11 +7,15 @@
  */
 enum fpga_ids {
        /* Technologic Systems */
-       TS7800_REV_1    = FPGAID(0x00b480, 0x01),
-       TS7800_REV_2    = FPGAID(0x00b480, 0x02),
-       TS7800_REV_3    = FPGAID(0x00b480, 0x03),
-       TS7800_REV_4    = FPGAID(0x00b480, 0x04),
-       TS7800_REV_5    = FPGAID(0x00b480, 0x05),
+       TS7800_REV_1    = FPGAID(TS7800_FPGA_MAGIC, 0x01),
+       TS7800_REV_2    = FPGAID(TS7800_FPGA_MAGIC, 0x02),
+       TS7800_REV_3    = FPGAID(TS7800_FPGA_MAGIC, 0x03),
+       TS7800_REV_4    = FPGAID(TS7800_FPGA_MAGIC, 0x04),
+       TS7800_REV_5    = FPGAID(TS7800_FPGA_MAGIC, 0x05),
+       TS7800_REV_6    = FPGAID(TS7800_FPGA_MAGIC, 0x06),
+       TS7800_REV_7    = FPGAID(TS7800_FPGA_MAGIC, 0x07),
+       TS7800_REV_8    = FPGAID(TS7800_FPGA_MAGIC, 0x08),
+       TS7800_REV_9    = FPGAID(TS7800_FPGA_MAGIC, 0x09),
 
        /* Unaffordable & Expensive */
        UAE_DUMMY       = FPGAID(0xffffff, 0x01),