diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-18 18:30:11 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-18 18:30:11 -0400 |
commit | 3985ee3b4c5f9e1d73623b92715375b089c54353 (patch) | |
tree | 13741edc5575b3ebb436f94b04e338b3b0701e9f /drivers/ide/pci/slc90e66.c | |
parent | 1c51361a9867021dd7444b56d87834003d4ca67d (diff) |
ide: add IDE_HFLAG_LEGACY_IRQS host flag
Add IDE_HFLAG_LEGACY_IRQS host flag to tell ide_pci_setup_ports() to set
hwif->irq to legacy IRQ 14/15 (iff hwif->irq is not already set) and convert
atiixp, piix, serverworks, sis5513 and slc90e66 host drivers to use it.
While at it:
* In piix.c add IDE_HFLAGS_PIIX define and don't use ->init_hwif for MPIIX.
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci/slc90e66.c')
-rw-r--r-- | drivers/ide/pci/slc90e66.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c index 416fbab2ed36..d85a48e7deba 100644 --- a/drivers/ide/pci/slc90e66.c +++ b/drivers/ide/pci/slc90e66.c | |||
@@ -133,9 +133,6 @@ static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif) | |||
133 | u8 reg47 = 0; | 133 | u8 reg47 = 0; |
134 | u8 mask = hwif->channel ? 0x01 : 0x02; /* bit0:Primary */ | 134 | u8 mask = hwif->channel ? 0x01 : 0x02; /* bit0:Primary */ |
135 | 135 | ||
136 | if (!hwif->irq) | ||
137 | hwif->irq = hwif->channel ? 15 : 14; | ||
138 | |||
139 | hwif->set_pio_mode = &slc90e66_set_pio_mode; | 136 | hwif->set_pio_mode = &slc90e66_set_pio_mode; |
140 | hwif->set_dma_mode = &slc90e66_set_dma_mode; | 137 | hwif->set_dma_mode = &slc90e66_set_dma_mode; |
141 | 138 | ||
@@ -156,7 +153,7 @@ static ide_pci_device_t slc90e66_chipset __devinitdata = { | |||
156 | .name = "SLC90E66", | 153 | .name = "SLC90E66", |
157 | .init_hwif = init_hwif_slc90e66, | 154 | .init_hwif = init_hwif_slc90e66, |
158 | .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, | 155 | .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, |
159 | .host_flags = IDE_HFLAG_BOOTABLE, | 156 | .host_flags = IDE_HFLAG_LEGACY_IRQS | IDE_HFLAG_BOOTABLE, |
160 | .pio_mask = ATA_PIO4, | 157 | .pio_mask = ATA_PIO4, |
161 | .swdma_mask = ATA_SWDMA2_ONLY, | 158 | .swdma_mask = ATA_SWDMA2_ONLY, |
162 | .mwdma_mask = ATA_MWDMA12_ONLY, | 159 | .mwdma_mask = ATA_MWDMA12_ONLY, |