aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-04-23 23:57:12 -0400
committerPaul Mackerras <paulus@samba.org>2007-04-23 23:57:12 -0400
commitedfedbf0cd0a57b16b638275e8fe8c369580b726 (patch)
treeb00ceb32f68dee0cc65173cd718c62ef4c4fb6e0
parentb142eb3a5aa4f4779597b7a913c002287fa6ee08 (diff)
[POWERPC] Partially revert "Add correct interrupt property for pegasos ide"
It turns out that commit e48059225c2edc6f1e5a2008261f1efdf606f247 breaks some existing systems that use the via82cxxx driver. This reverts the change to via82cxxx.c. Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--drivers/ide/pci/via82cxxx.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index 8cc5423892ac..a508550c4095 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -35,6 +35,10 @@
35#include <linux/ide.h> 35#include <linux/ide.h>
36#include <asm/io.h> 36#include <asm/io.h>
37 37
38#ifdef CONFIG_PPC_CHRP
39#include <asm/processor.h>
40#endif
41
38#include "ide-timing.h" 42#include "ide-timing.h"
39 43
40#define DISPLAY_VIA_TIMINGS 44#define DISPLAY_VIA_TIMINGS
@@ -432,6 +436,13 @@ static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif)
432 hwif->tuneproc = &via82cxxx_tune_drive; 436 hwif->tuneproc = &via82cxxx_tune_drive;
433 hwif->speedproc = &via_set_drive; 437 hwif->speedproc = &via_set_drive;
434 438
439
440#ifdef CONFIG_PPC_CHRP
441 if(machine_is(chrp) && _chrp_type == _CHRP_Pegasos) {
442 hwif->irq = hwif->channel ? 15 : 14;
443 }
444#endif
445
435 for (i = 0; i < 2; i++) { 446 for (i = 0; i < 2; i++) {
436 hwif->drives[i].io_32bit = 1; 447 hwif->drives[i].io_32bit = 1;
437 hwif->drives[i].unmask = (vdev->via_config->flags & VIA_NO_UNMASK) ? 0 : 1; 448 hwif->drives[i].unmask = (vdev->via_config->flags & VIA_NO_UNMASK) ? 0 : 1;