Skip to contentSkip to conversation

Update ide/ppc/pmac.c

PATCH New Benjamin Herrenschmidt 1 participant 1 message May 23, 2003 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Update ide/ppc/pmac.c

Hi Marcelo !

This patch against 2.4.21-rc3 will update drivers/ide/ppc/pmac.c to the latest version in my 2.4.21 tree. It makes use of the "hold" field you added to hwif in -rc3 to avoid a problem with ide-cs, fix the DMA routines for proper usage of the new ide_exectute_command(), and remove a now useless delay (since ide-probe.c now contains the wait for BSY, the delay is no longer useful), and finally, allow the new "Kauai" ATA/100 interfaces to be probed before the old ones so the internal HD of those machines becomes hda and not hde

Please apply before your release 2.4.21 final,

Ben.

===== drivers/ide/Config.in 1.27 vs edited =====

drivers/ide/Config.in +1 -0
@@ -82,6 +82,7 @@
       fi
       if [ "$CONFIG_ALL_PPC" = "y" ]; then
 	 bool '    Builtin PowerMac IDE support' CONFIG_BLK_DEV_IDE_PMAC
+	 dep_bool '      Probe internal Kauai ATA/100 first' CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST $CONFIG_BLK_DEV_IDE_PMAC
 	 dep_bool '      PowerMac IDE DMA support' CONFIG_BLK_DEV_IDEDMA_PMAC $CONFIG_BLK_DEV_IDE_PMAC
 	 dep_bool '        Use DMA by default' CONFIG_BLK_DEV_IDEDMA_PMAC_AUTO $CONFIG_BLK_DEV_IDEDMA_PMAC
 	 if [ "$CONFIG_BLK_DEV_IDE_PMAC" = "y" ]; then

===== drivers/ide/ppc/pmac.c 1.13 vs edited =====

drivers/ide/ppc/pmac.c +32 -29

157 lines not on this page · raw message