aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 07:46:23 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 07:46:23 -0400
commit09a3e79187c56842d509430267ece5b82216baee (patch)
tree624ab9e802539f86d352e5f0b617ba5b2db34ffe /drivers/ide
parente354c1d8033d97a97a38a1b2cffa1bc285b92ad4 (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>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/buddha.c6
-rw-r--r--drivers/ide/falconide.c3
-rw-r--r--drivers/ide/gayle.c6
-rw-r--r--drivers/ide/macide.c2
-rw-r--r--drivers/ide/q40ide.c2
5 files changed, 7 insertions, 12 deletions
diff --git a/drivers/ide/buddha.c b/drivers/ide/buddha.c
index c0fa76148d46..606c3320fa58 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,
144} 144}
145 145
146static const struct ide_port_info buddha_port_info = { 146static const struct ide_port_info buddha_port_info = {
147 .host_flags = IDE_HFLAG_NO_DMA, 147 .host_flags = IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA,
148}; 148};
149 149
150 /* 150 /*
@@ -176,10 +176,6 @@ static int __init buddha_init(void)
176 176
177 board = z->resource.start; 177 board = z->resource.start;
178 178
179/*
180 * FIXME: we now have selectable mmio v/s iomio transports.
181 */
182
183 if(type != BOARD_XSURF) { 179 if(type != BOARD_XSURF) {
184 if (!request_mem_region(board+BUDDHA_BASE1, 0x800, "IDE")) 180 if (!request_mem_region(board+BUDDHA_BASE1, 0x800, "IDE"))
185 continue; 181 continue;
diff --git a/drivers/ide/falconide.c b/drivers/ide/falconide.c
index d4d7ff1a3516..27a569520743 100644
--- a/drivers/ide/falconide.c
+++ b/drivers/ide/falconide.c
@@ -103,7 +103,8 @@ static const struct ide_port_info falconide_port_info = {
103 .get_lock = falconide_get_lock, 103 .get_lock = falconide_get_lock,
104 .release_lock = falconide_release_lock, 104 .release_lock = falconide_release_lock,
105 .tp_ops = &falconide_tp_ops, 105 .tp_ops = &falconide_tp_ops,
106 .host_flags = IDE_HFLAG_NO_DMA | IDE_HFLAG_SERIALIZE, 106 .host_flags = IDE_HFLAG_MMIO | IDE_HFLAG_SERIALIZE |
107 IDE_HFLAG_NO_DMA,
107}; 108};
108 109
109static void __init falconide_setup_ports(hw_regs_t *hw) 110static void __init falconide_setup_ports(hw_regs_t *hw)
diff --git a/drivers/ide/gayle.c b/drivers/ide/gayle.c
index 59bd0be9dcb3..dce01765adbc 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,
118} 118}
119 119
120static const struct ide_port_info gayle_port_info = { 120static const struct ide_port_info gayle_port_info = {
121 .host_flags = IDE_HFLAG_SERIALIZE | IDE_HFLAG_NO_DMA, 121 .host_flags = IDE_HFLAG_MMIO | IDE_HFLAG_SERIALIZE |
122 IDE_HFLAG_NO_DMA,
122}; 123};
123 124
124 /* 125 /*
@@ -163,9 +164,6 @@ found:
163 irqport = (unsigned long)ZTWO_VADDR(GAYLE_IRQ_1200); 164 irqport = (unsigned long)ZTWO_VADDR(GAYLE_IRQ_1200);
164 ack_intr = gayle_ack_intr_a1200; 165 ack_intr = gayle_ack_intr_a1200;
165 } 166 }
166/*
167 * FIXME: we now have selectable modes between mmio v/s iomio
168 */
169 167
170 res_start = ((unsigned long)phys_base) & ~(GAYLE_NEXT_PORT-1); 168 res_start = ((unsigned long)phys_base) & ~(GAYLE_NEXT_PORT-1);
171 res_n = GAYLE_IDEREG_SIZE; 169 res_n = GAYLE_IDEREG_SIZE;
diff --git a/drivers/ide/macide.c b/drivers/ide/macide.c
index e9f965e795ff..56112ee9f5a8 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,
81} 81}
82 82
83static const struct ide_port_info macide_port_info = { 83static const struct ide_port_info macide_port_info = {
84 .host_flags = IDE_HFLAG_NO_DMA, 84 .host_flags = IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA,
85}; 85};
86 86
87static const char *mac_ide_name[] = 87static const char *mac_ide_name[] =
diff --git a/drivers/ide/q40ide.c b/drivers/ide/q40ide.c
index 9f9c0b3cc3a3..fa8922ef3c65 100644
--- a/drivers/ide/q40ide.c
+++ b/drivers/ide/q40ide.c
@@ -111,7 +111,7 @@ static const struct ide_tp_ops q40ide_tp_ops = {
111 111
112static const struct ide_port_info q40ide_port_info = { 112static const struct ide_port_info q40ide_port_info = {
113 .tp_ops = &q40ide_tp_ops, 113 .tp_ops = &q40ide_tp_ops,
114 .host_flags = IDE_HFLAG_NO_DMA, 114 .host_flags = IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA,
115}; 115};
116 116
117/* 117/*