diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 12:46:23 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 12:46:23 +0100 |
| commit | 09a3e79187c56842d509430267ece5b82216baee (patch) | |
| tree | 624ab9e802539f86d352e5f0b617ba5b2db34ffe | |
| parent | e354c1d8033d97a97a38a1b2cffa1bc285b92ad4 (diff) | |
ide: make m68k host drivers use IDE_HFLAG_MMIO
Cc: 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/buddha.c | 6 | ||||
| -rw-r--r-- | drivers/ide/falconide.c | 3 | ||||
| -rw-r--r-- | drivers/ide/gayle.c | 6 | ||||
| -rw-r--r-- | drivers/ide/macide.c | 2 | ||||
| -rw-r--r-- | drivers/ide/q40ide.c | 2 |
5 files changed, 7 insertions, 12 deletions
diff --git a/drivers/ide/buddha.c b/drivers/ide/buddha.c index c0fa76148d4..606c3320fa5 100644 --- a/drivers/ide/buddha.c +++ b/drivers/ide/buddha.c @@ -144,7 +144,7 @@ static void __init buddha_setup_ports(hw_regs_t *hw, unsigned long base, } static const struct ide_port_info buddha_port_info = { - .host_flags = IDE_HFLAG_NO_DMA, + .host_flags = IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA, }; /* @@ -176,10 +176,6 @@ static int __init buddha_init(void) board = z->resource.start; -/* - * FIXME: we now have selectable mmio v/s iomio transports. - */ - if(type != BOARD_XSURF) { if (!request_mem_region(board+BUDDHA_BASE1, 0x800, "IDE")) continue; diff --git a/drivers/ide/falconide.c b/drivers/ide/falconide.c index d4d7ff1a351..27a56952074 100644 --- a/drivers/ide/falconide.c +++ b/drivers/ide/falconide.c @@ -103,7 +103,8 @@ static const struct ide_port_info falconide_port_info = { .get_lock = falconide_get_lock, .release_lock = falconide_release_lock, .tp_ops = &falconide_tp_ops, - .host_flags = IDE_HFLAG_NO_DMA | IDE_HFLAG_SERIALIZE, + .host_flags = IDE_HFLAG_MMIO | IDE_HFLAG_SERIALIZE | + IDE_HFLAG_NO_DMA, }; static void __init falconide_setup_ports(hw_regs_t *hw) diff --git a/drivers/ide/gayle.c b/drivers/ide/gayle.c index 59bd0be9dcb..dce01765adb 100644 --- a/drivers/ide/gayle.c +++ b/drivers/ide/gayle.c @@ -118,7 +118,8 @@ static void __init gayle_setup_ports(hw_regs_t *hw, unsigned long base, } static const struct ide_port_info gayle_port_info = { - .host_flags = IDE_HFLAG_SERIALIZE | IDE_HFLAG_NO_DMA, + .host_flags = IDE_HFLAG_MMIO | IDE_HFLAG_SERIALIZE | + IDE_HFLAG_NO_DMA, }; /* @@ -163,9 +164,6 @@ found: irqport = (unsigned long)ZTWO_VADDR(GAYLE_IRQ_1200); ack_intr = gayle_ack_intr_a1200; } -/* - * FIXME: we now have selectable modes between mmio v/s iomio - */ res_start = ((unsigned long)phys_base) & ~(GAYLE_NEXT_PORT-1); res_n = GAYLE_IDEREG_SIZE; diff --git a/drivers/ide/macide.c b/drivers/ide/macide.c index e9f965e795f..56112ee9f5a 100644 --- a/drivers/ide/macide.c +++ b/drivers/ide/macide.c @@ -81,7 +81,7 @@ static void __init macide_setup_ports(hw_regs_t *hw, unsigned long base, } static const struct ide_port_info macide_port_info = { - .host_flags = IDE_HFLAG_NO_DMA, + .host_flags = IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA, }; static const char *mac_ide_name[] = diff --git a/drivers/ide/q40ide.c b/drivers/ide/q40ide.c index 9f9c0b3cc3a..fa8922ef3c6 100644 --- a/drivers/ide/q40ide.c +++ b/drivers/ide/q40ide.c @@ -111,7 +111,7 @@ static const struct ide_tp_ops q40ide_tp_ops = { static const struct ide_port_info q40ide_port_info = { .tp_ops = &q40ide_tp_ops, - .host_flags = IDE_HFLAG_NO_DMA, + .host_flags = IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA, }; /* |