[ARM] orion5x: added a new FPGA ID set for the TS-78xx

Stefan Agner found his board comes with 0x00b480/0x02 but the main
board also has Rev B printed on it like my 0x00b480/0x03.  Some light
enum renaming was needed but it was to be expected.

Signed-off-by: Alexander Clouter <alex@digriz.org.uk>
Signed-off-by: Nicolas Pitre <nico@marvell.com>

diff --git a/arch/arm/mach-orion5x/ts78xx-fpga.h b/arch/arm/mach-orion5x/ts78xx-fpga.h
index e2c503c7807e34518039399e73202af917c00751..0a314ddef658bac9cf9d0b61269eaba48d811e96 100644 (file)
--- a/arch/arm/mach-orion5x/ts78xx-fpga.h
+++ b/arch/arm/mach-orion5x/ts78xx-fpga.h
@@ -6,7 +6,8 @@
  */
 enum fpga_ids {
        /* Technologic Systems */
-       TS7800_REV_B = FPGAID(0x00b480, 0x03),
+       TS7800_REV_B2 = FPGAID(0x00b480, 0x02),
+       TS7800_REV_B3 = FPGAID(0x00b480, 0x03),
 };
 
 struct fpga_device {

diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c
index a6eec4e494249bf19421b26ff47c64697e000233..f5191ddea085832c1f57369ed212bca821e32a2f 100644 (file)
--- a/arch/arm/mach-orion5x/ts78xx-setup.c
+++ b/arch/arm/mach-orion5x/ts78xx-setup.c
@@ -282,7 +282,8 @@ static void ts78xx_fpga_supports(void)
 {
        /* TODO: put this 'table' into ts78xx-fpga.h */
        switch (ts78xx_fpga.id) {
-       case TS7800_REV_B:
+       case TS7800_REV_B2:
+       case TS7800_REV_B3:
                ts78xx_fpga.supports.ts_rtc.present = 1;
                ts78xx_fpga.supports.ts_nand.present = 1;
                break;