diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-25 10:00:08 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-25 10:00:08 +0000 |
| commit | cf281a99b6e4f1223c8fdce390db3bf79e773f4c (patch) | |
| tree | 33bff28362b5e41f7a2a09c097e0d2ea6e4ded13 /arch/arm/mach-orion5x | |
| parent | fbf2b1f9cfdb4e4b5d042839142ed19ff5d46679 (diff) | |
| parent | 9d1d4f9eabbca276a2a618a94ed3149d5971063e (diff) | |
| download | lwn-cf281a99b6e4f1223c8fdce390db3bf79e773f4c.tar.gz lwn-cf281a99b6e4f1223c8fdce390db3bf79e773f4c.zip | |
Merge git://git.marvell.com/orion into devel
Diffstat (limited to 'arch/arm/mach-orion5x')
| -rw-r--r-- | arch/arm/mach-orion5x/ts78xx-fpga.h | 10 | ||||
| -rw-r--r-- | arch/arm/mach-orion5x/ts78xx-setup.c | 7 |
2 files changed, 13 insertions, 4 deletions
diff --git a/arch/arm/mach-orion5x/ts78xx-fpga.h b/arch/arm/mach-orion5x/ts78xx-fpga.h index 0a314ddef658..0f9cdf458952 100644 --- a/arch/arm/mach-orion5x/ts78xx-fpga.h +++ b/arch/arm/mach-orion5x/ts78xx-fpga.h @@ -6,8 +6,14 @@ */ enum fpga_ids { /* Technologic Systems */ - TS7800_REV_B2 = FPGAID(0x00b480, 0x02), - TS7800_REV_B3 = FPGAID(0x00b480, 0x03), + 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), + + /* Unaffordable & Expensive */ + UAE_DUMMY = FPGAID(0xffffff, 0x01), }; struct fpga_device { diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c index f5191ddea085..9a6b397f972d 100644 --- a/arch/arm/mach-orion5x/ts78xx-setup.c +++ b/arch/arm/mach-orion5x/ts78xx-setup.c @@ -282,8 +282,11 @@ static void ts78xx_fpga_supports(void) { /* TODO: put this 'table' into ts78xx-fpga.h */ switch (ts78xx_fpga.id) { - case TS7800_REV_B2: - case TS7800_REV_B3: + case TS7800_REV_1: + case TS7800_REV_2: + case TS7800_REV_3: + case TS7800_REV_4: + case TS7800_REV_5: ts78xx_fpga.supports.ts_rtc.present = 1; ts78xx_fpga.supports.ts_nand.present = 1; break; |