aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorAnton Vorontsov <avorontsov@ru.mvista.com>2008-04-29 16:57:38 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-04-29 16:57:38 -0400
commit6d1cee44361b8d06ccd1812e80448d86ae60dfe3 (patch)
tree681769a557a21978b466cf5e1a5756014763d89a /drivers/ide
parentb26b0c590066f65ff3b1ff438502f3c40ea39520 (diff)
alim15x3: disable init_hwif_ali15x3 for PowerPC
We don't need init_hwif_ali15x3() on the PowerPC systems either. Before: ALI15X3: IDE controller (0x10b9:0x5229 rev 0xc8) at PCI slot 0001:03:1f.0 ALI15X3: 100% native mode on irq 19 ide0: BM-DMA at 0x1120-0x1127 ide1: BM-DMA at 0x1128-0x112f hda: SONY DVD RW AW-Q170A, ATAPI CD/DVD-ROM drive hda: UDMA/66 mode selected ide0: Disabled unable to get IRQ 14. ide0: failed to initialize IDE interface ide1: Disabled unable to get IRQ 15. ide1: failed to initialize IDE interface After: ALI15X3: IDE controller (0x10b9:0x5229 rev 0xc8) at PCI slot 0001:03:1f.0 ALI15X3: 100% native mode on irq 19 ide0: BM-DMA at 0x1120-0x1127 ide1: BM-DMA at 0x1128-0x112f hda: SONY DVD RW AW-Q170A, ATAPI CD/DVD-ROM drive hda: UDMA/66 mode selected ide0 at 0x1100-0x1107,0x110a on irq 19 ide1 at 0x1110-0x1117,0x111a on irq 19 hda: ATAPI 48X DVD-ROM DVD-R CD-R/RW drive, 2048kB Cache ide0 works well, though I can't test ide1, it isn't traced out on the board. Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/pci/alim15x3.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index b36a22b8c213..c1922f9cfe80 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -412,14 +412,14 @@ static u8 __devinit ali_cable_detect(ide_hwif_t *hwif)
412 return cbl; 412 return cbl;
413} 413}
414 414
415#ifndef CONFIG_SPARC64 415#if !defined(CONFIG_SPARC64) && !defined(CONFIG_PPC)
416/** 416/**
417 * init_hwif_ali15x3 - Initialize the ALI IDE x86 stuff 417 * init_hwif_ali15x3 - Initialize the ALI IDE x86 stuff
418 * @hwif: interface to configure 418 * @hwif: interface to configure
419 * 419 *
420 * Obtain the IRQ tables for an ALi based IDE solution on the PC 420 * Obtain the IRQ tables for an ALi based IDE solution on the PC
421 * class platforms. This part of the code isn't applicable to the 421 * class platforms. This part of the code isn't applicable to the
422 * Sparc systems 422 * Sparc and PowerPC systems.
423 */ 423 */
424 424
425static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif) 425static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif)
@@ -463,7 +463,9 @@ static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif)
463 hwif->irq = irq; 463 hwif->irq = irq;
464 } 464 }
465} 465}
466#endif 466#else
467#define init_hwif_ali15x3 NULL
468#endif /* !defined(CONFIG_SPARC64) && !defined(CONFIG_PPC) */
467 469
468/** 470/**
469 * init_dma_ali15x3 - set up DMA on ALi15x3 471 * init_dma_ali15x3 - set up DMA on ALi15x3
@@ -517,9 +519,7 @@ static const struct ide_dma_ops ali_dma_ops = {
517static const struct ide_port_info ali15x3_chipset __devinitdata = { 519static const struct ide_port_info ali15x3_chipset __devinitdata = {
518 .name = "ALI15X3", 520 .name = "ALI15X3",
519 .init_chipset = init_chipset_ali15x3, 521 .init_chipset = init_chipset_ali15x3,
520#ifndef CONFIG_SPARC64
521 .init_hwif = init_hwif_ali15x3, 522 .init_hwif = init_hwif_ali15x3,
522#endif
523 .init_dma = init_dma_ali15x3, 523 .init_dma = init_dma_ali15x3,
524 .port_ops = &ali_port_ops, 524 .port_ops = &ali_port_ops,
525 .pio_mask = ATA_PIO5, 525 .pio_mask = ATA_PIO5,