diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2008-02-18 19:41:24 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-18 19:41:24 -0500 |
commit | 899e1bc57340ad9acf5561b1eff7a684975ad800 (patch) | |
tree | 897c58c24b5ce4848ceeb2a77e0e10b54fc1182e | |
parent | f702c5815696bfca095cc1173fff6995c4d39844 (diff) |
ide: Add missing base addresses for falconide and macide
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>
-rw-r--r-- | drivers/ide/legacy/falconide.c | 2 | ||||
-rw-r--r-- | drivers/ide/legacy/macide.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/legacy/falconide.c b/drivers/ide/legacy/falconide.c index f044048903b3..07bf1294a9db 100644 --- a/drivers/ide/legacy/falconide.c +++ b/drivers/ide/legacy/falconide.c | |||
@@ -54,7 +54,7 @@ static void __init falconide_setup_ports(hw_regs_t *hw) | |||
54 | for (i = 1; i < 8; i++) | 54 | for (i = 1; i < 8; i++) |
55 | hw->io_ports[i] = ATA_HD_BASE + 1 + i * 4; | 55 | hw->io_ports[i] = ATA_HD_BASE + 1 + i * 4; |
56 | 56 | ||
57 | hw->io_ports[IDE_CONTROL_OFFSET] = ATA_HD_CONTROL; | 57 | hw->io_ports[IDE_CONTROL_OFFSET] = ATA_HD_BASE + ATA_HD_CONTROL; |
58 | 58 | ||
59 | hw->irq = IRQ_MFP_IDE; | 59 | hw->irq = IRQ_MFP_IDE; |
60 | hw->ack_intr = NULL; | 60 | hw->ack_intr = NULL; |
diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c index a61e60737dc7..9a79098d9eb4 100644 --- a/drivers/ide/legacy/macide.c +++ b/drivers/ide/legacy/macide.c | |||
@@ -74,7 +74,7 @@ static void __init macide_setup_ports(hw_regs_t *hw, unsigned long base, | |||
74 | for (i = 0; i < 8; i++) | 74 | for (i = 0; i < 8; i++) |
75 | hw->io_ports[i] = base + i * 4; | 75 | hw->io_ports[i] = base + i * 4; |
76 | 76 | ||
77 | hw->io_ports[IDE_CONTROL_OFFSET] = IDE_CONTROL; | 77 | hw->io_ports[IDE_CONTROL_OFFSET] = base + IDE_CONTROL; |
78 | 78 | ||
79 | hw->irq = irq; | 79 | hw->irq = irq; |
80 | hw->ack_intr = ack_intr; | 80 | hw->ack_intr = ack_intr; |