diff options
author | David Daney <david.daney@cavium.com> | 2012-04-26 14:10:28 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2012-12-13 12:15:24 -0500 |
commit | 43f01da0f2794b464ade2ffe1f780c69d7ce7b75 (patch) | |
tree | dcbf33bffe33aa06d967c451df48e0b78c32ebdb /arch/mips/include/asm/octeon/octeon.h | |
parent | f772cdb2bd544eeb3e83a8bb42629d155c1b53fd (diff) |
MIPS/OCTEON/ata: Convert pata_octeon_cf.c to use device tree.
The patch needs to eliminate the definition of OCTEON_IRQ_BOOTDMA so
that the device tree code can map the interrupt, so in order to not
temporarily break things, we do a single patch to both the interrupt
registration code and the pata_octeon_cf driver.
Also rolled in is a conversion to use hrtimers and corrections to the
timing calculations.
Acked-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: David Daney <david.daney@cavium.com>
Diffstat (limited to 'arch/mips/include/asm/octeon/octeon.h')
-rw-r--r-- | arch/mips/include/asm/octeon/octeon.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/mips/include/asm/octeon/octeon.h b/arch/mips/include/asm/octeon/octeon.h index 790939dd8244..254e9954ed71 100644 --- a/arch/mips/include/asm/octeon/octeon.h +++ b/arch/mips/include/asm/octeon/octeon.h | |||
@@ -209,13 +209,6 @@ union octeon_cvmemctl { | |||
209 | } s; | 209 | } s; |
210 | }; | 210 | }; |
211 | 211 | ||
212 | struct octeon_cf_data { | ||
213 | unsigned long base_region_bias; | ||
214 | unsigned int base_region; /* The chip select region used by CF */ | ||
215 | int is16bit; /* 0 - 8bit, !0 - 16bit */ | ||
216 | int dma_engine; /* -1 for no DMA */ | ||
217 | }; | ||
218 | |||
219 | extern void octeon_write_lcd(const char *s); | 212 | extern void octeon_write_lcd(const char *s); |
220 | extern void octeon_check_cpu_bist(void); | 213 | extern void octeon_check_cpu_bist(void); |
221 | extern int octeon_get_boot_debug_flag(void); | 214 | extern int octeon_get_boot_debug_flag(void); |