diff options
author | Alexander Clouter <alex@digriz.org.uk> | 2009-03-04 16:30:51 -0500 |
---|---|---|
committer | Nicolas Pitre <nico@cam.org> | 2009-03-04 17:07:05 -0500 |
commit | 195f4a170eaeb8ef37c73e02adef2579168e9287 (patch) | |
tree | 28c332e4518187dff49207e7b3e726da34730b99 | |
parent | 693599438909de47fbfa4246bf67d6c535f719b5 (diff) |
[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>
-rw-r--r-- | arch/arm/mach-orion5x/ts78xx-fpga.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-orion5x/ts78xx-setup.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-orion5x/ts78xx-fpga.h b/arch/arm/mach-orion5x/ts78xx-fpga.h index e2c503c7807e..0a314ddef658 100644 --- a/arch/arm/mach-orion5x/ts78xx-fpga.h +++ b/arch/arm/mach-orion5x/ts78xx-fpga.h | |||
@@ -6,7 +6,8 @@ | |||
6 | */ | 6 | */ |
7 | enum fpga_ids { | 7 | enum fpga_ids { |
8 | /* Technologic Systems */ | 8 | /* Technologic Systems */ |
9 | TS7800_REV_B = FPGAID(0x00b480, 0x03), | 9 | TS7800_REV_B2 = FPGAID(0x00b480, 0x02), |
10 | TS7800_REV_B3 = FPGAID(0x00b480, 0x03), | ||
10 | }; | 11 | }; |
11 | 12 | ||
12 | struct fpga_device { | 13 | struct fpga_device { |
diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c index a6eec4e49424..f5191ddea085 100644 --- 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) | |||
282 | { | 282 | { |
283 | /* TODO: put this 'table' into ts78xx-fpga.h */ | 283 | /* TODO: put this 'table' into ts78xx-fpga.h */ |
284 | switch (ts78xx_fpga.id) { | 284 | switch (ts78xx_fpga.id) { |
285 | case TS7800_REV_B: | 285 | case TS7800_REV_B2: |
286 | case TS7800_REV_B3: | ||
286 | ts78xx_fpga.supports.ts_rtc.present = 1; | 287 | ts78xx_fpga.supports.ts_rtc.present = 1; |
287 | ts78xx_fpga.supports.ts_nand.present = 1; | 288 | ts78xx_fpga.supports.ts_nand.present = 1; |
288 | break; | 289 | break; |