Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edfedbf0 authored Apr 24, 2007 by 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: Paul Mackerras <paulus@samba.org>

parent b142eb3a

drivers/ide/pci/via82cxxx.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,10 @@
		#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
		@@ -432,6 +436,13 @@ static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif)
		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;