ide: Add missing base addresses for falconide and macide
Geert Uytterhoeven [Tue, 19 Feb 2008 00:41:24 +0000 (01:41 +0100)]
commit 29dd59755a849cc6475faa6a75f3b804e23a6fc2 ("ide: remove ide_setup_ports")
forgot to take into account the base addresses for the CONTROL registers for
falconide and macide, as pointed out by Michael Schmitz.

Falconide was tested on Aranym.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Michael Schmitz <schmitz@debian.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

drivers/ide/legacy/falconide.c
drivers/ide/legacy/macide.c

index f044048..07bf129 100644 (file)
@@ -54,7 +54,7 @@ static void __init falconide_setup_ports(hw_regs_t *hw)
        for (i = 1; i < 8; i++)
                hw->io_ports[i] = ATA_HD_BASE + 1 + i * 4;
 
-       hw->io_ports[IDE_CONTROL_OFFSET] = ATA_HD_CONTROL;
+       hw->io_ports[IDE_CONTROL_OFFSET] = ATA_HD_BASE + ATA_HD_CONTROL;
 
        hw->irq = IRQ_MFP_IDE;
        hw->ack_intr = NULL;
index a61e607..9a79098 100644 (file)
@@ -74,7 +74,7 @@ static void __init macide_setup_ports(hw_regs_t *hw, unsigned long base,
        for (i = 0; i < 8; i++)
                hw->io_ports[i] = base + i * 4;
 
-       hw->io_ports[IDE_CONTROL_OFFSET] = IDE_CONTROL;
+       hw->io_ports[IDE_CONTROL_OFFSET] = base + IDE_CONTROL;
 
        hw->irq = irq;
        hw->ack_intr = ack_intr;