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

Commit 03682411 authored by Anton Vorontsov's avatar Anton Vorontsov Committed by Bartlomiej Zolnierkiewicz
Browse files

alim15x3: Remove historical hacks, re-enable init_hwif for PowerPC 



Some time ago we had to disable init_hwif callback for PowerPC builds.
That was because of a historical IRQ overwrite in the driver, which
was causing IDE malfunction on the MPC8610HPCD PowerPC boards.

It's unclear whether this overwrite is still useful, but it is proven
to cause a bit of harm, and today some PowerPC targets (Xilinx ML510,
as reported by Roderick Colenbrander) need the init_hwif, so we have
to re-enable it and remove the overwrite.

Reported-by: default avatarRoderick Colenbrander <thunderbird2k@gmail.com>
Suggested-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 23a39eed

drivers/ide/alim15x3.c

+3 −7
Original line number Diff line number Diff line
@@ -402,27 +402,23 @@ static u8 ali_cable_detect(ide_hwif_t *hwif) 
	return cbl;

}



#if !defined(CONFIG_SPARC64) && !defined(CONFIG_PPC)

#ifndef CONFIG_SPARC64

/**

 *	init_hwif_ali15x3	-	Initialize the ALI IDE x86 stuff

 *	@hwif: interface to configure

 *

 *	Obtain the IRQ tables for an ALi based IDE solution on the PC

 *	class platforms. This part of the code isn't applicable to the

 *	Sparc and PowerPC systems.

 *	Sparc systems.

 */



static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif)

{

	struct pci_dev *dev = to_pci_dev(hwif->dev);

	u8 ideic, inmir;

	s8 irq_routing_table[] = { -1,  9, 3, 10, 4,  5, 7,  6,

				      1, 11, 0, 12, 0, 14, 0, 15 };

	int irq = -1;



	if (dev->device == PCI_DEVICE_ID_AL_M5229)

		hwif->irq = hwif->channel ? 15 : 14;



	if (isa_dev) {

		/*

		 * read IDE interface control
@@ -455,7 +451,7 @@ static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif) 
}

#else

#define init_hwif_ali15x3 NULL

#endif /* !defined(CONFIG_SPARC64) && !defined(CONFIG_PPC) */

#endif /* CONFIG_SPARC64 */



/**

 *	init_dma_ali15x3	-	set up DMA on ALi15x3