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>

diff --git a/drivers/ide/buddha.c b/drivers/ide/buddha.c
index c0fa76148d4629f807a0933e3027dd5ee0b255ec..606c3320fa58f62ab54fe4329553ded9a708de5f 100644 (file)
--- 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 d4d7ff1a3516739ad9732cee5f59a2e9db46674a..27a56952074369e1538af4964f7e232d884d90e4 100644 (file)
--- 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 59bd0be9dcb3aac5715daf3ed0dec8f8b48b1c94..dce01765adbc3a17aa67eab39c1bce90627aba43 100644 (file)
--- 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 e9f965e795ffef09eed215887882ab619499b979..56112ee9f5a86356e46053d8052e8fbdf5add4fa 100644 (file)
--- 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 9f9c0b3cc3a325de1596c625590c9a4161096ba3..fa8922ef3c6502dcdf440c8998a7516e5444297d 100644 (file)
--- 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,
 };
 
 /*