Commit edfedbf0 authored by Paul Mackerras's avatar Paul Mackerras

[POWERPC] Partially revert "Add correct interrupt property for pegasos ide"

It turns out that commit e4805922
breaks some existing systems that use the via82cxxx driver.  This
reverts the change to via82cxxx.c.
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent b142eb3a
...@@ -35,6 +35,10 @@ ...@@ -35,6 +35,10 @@
#include <linux/ide.h> #include <linux/ide.h>
#include <asm/io.h> #include <asm/io.h>
#ifdef CONFIG_PPC_CHRP
#include <asm/processor.h>
#endif
#include "ide-timing.h" #include "ide-timing.h"
#define DISPLAY_VIA_TIMINGS #define DISPLAY_VIA_TIMINGS
...@@ -432,6 +436,13 @@ static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif) ...@@ -432,6 +436,13 @@ static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif)
hwif->tuneproc = &via82cxxx_tune_drive; hwif->tuneproc = &via82cxxx_tune_drive;
hwif->speedproc = &via_set_drive; hwif->speedproc = &via_set_drive;
#ifdef CONFIG_PPC_CHRP
if(machine_is(chrp) && _chrp_type == _CHRP_Pegasos) {
hwif->irq = hwif->channel ? 15 : 14;
}
#endif
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
hwif->drives[i].io_32bit = 1; hwif->drives[i].io_32bit = 1;
hwif->drives[i].unmask = (vdev->via_config->flags & VIA_NO_UNMASK) ? 0 : 1; hwif->drives[i].unmask = (vdev->via_config->flags & VIA_NO_UNMASK) ? 0 : 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment