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>
#include <linux/ide.h>
#include <asm/io.h>
+#ifdef CONFIG_PPC_CHRP
+#include <asm/processor.h>
+#endif
+
#include "ide-timing.h"
#define DISPLAY_VIA_TIMINGS
hwif->tuneproc = &via82cxxx_tune_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++) {
hwif->drives[i].io_32bit = 1;
hwif->drives[i].unmask = (vdev->via_config->flags & VIA_NO_UNMASK) ? 0 : 1;