diff options
29 files changed, 33 insertions, 49 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index b8d96ce37fc9..3a0435181f77 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c | |||
@@ -176,7 +176,7 @@ static const struct ata_port_info ahci_port_info[] = { | |||
176 | AHCI_HFLAGS (AHCI_HFLAG_NO_NCQ | AHCI_HFLAG_NO_MSI | | 176 | AHCI_HFLAGS (AHCI_HFLAG_NO_NCQ | AHCI_HFLAG_NO_MSI | |
177 | AHCI_HFLAG_MV_PATA | AHCI_HFLAG_NO_PMP), | 177 | AHCI_HFLAG_MV_PATA | AHCI_HFLAG_NO_PMP), |
178 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 178 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | |
179 | ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA, | 179 | ATA_FLAG_PIO_DMA, |
180 | .pio_mask = ATA_PIO4, | 180 | .pio_mask = ATA_PIO4, |
181 | .udma_mask = ATA_UDMA6, | 181 | .udma_mask = ATA_UDMA6, |
182 | .port_ops = &ahci_ops, | 182 | .port_ops = &ahci_ops, |
diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index 3e606c34f57b..9a323417907e 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h | |||
@@ -214,7 +214,7 @@ enum { | |||
214 | /* ap->flags bits */ | 214 | /* ap->flags bits */ |
215 | 215 | ||
216 | AHCI_FLAG_COMMON = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 216 | AHCI_FLAG_COMMON = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | |
217 | ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA | | 217 | ATA_FLAG_PIO_DMA | |
218 | ATA_FLAG_ACPI_SATA | ATA_FLAG_AN | | 218 | ATA_FLAG_ACPI_SATA | ATA_FLAG_AN | |
219 | ATA_FLAG_LPM, | 219 | ATA_FLAG_LPM, |
220 | 220 | ||
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c index 8b5ea399a4f4..a791b8ce6294 100644 --- a/drivers/ata/libata-acpi.c +++ b/drivers/ata/libata-acpi.c | |||
@@ -660,8 +660,7 @@ static int ata_acpi_filter_tf(struct ata_device *dev, | |||
660 | * @dev: target ATA device | 660 | * @dev: target ATA device |
661 | * @gtf: raw ATA taskfile register set (0x1f1 - 0x1f7) | 661 | * @gtf: raw ATA taskfile register set (0x1f1 - 0x1f7) |
662 | * | 662 | * |
663 | * Outputs ATA taskfile to standard ATA host controller using MMIO | 663 | * Outputs ATA taskfile to standard ATA host controller. |
664 | * or PIO as indicated by the ATA_FLAG_MMIO flag. | ||
665 | * Writes the control, feature, nsect, lbal, lbam, and lbah registers. | 664 | * Writes the control, feature, nsect, lbal, lbam, and lbah registers. |
666 | * Optionally (ATA_TFLAG_LBA48) writes hob_feature, hob_nsect, | 665 | * Optionally (ATA_TFLAG_LBA48) writes hob_feature, hob_nsect, |
667 | * hob_lbal, hob_lbam, and hob_lbah. | 666 | * hob_lbal, hob_lbam, and hob_lbah. |
diff --git a/drivers/ata/pata_at32.c b/drivers/ata/pata_at32.c index 66ce6a526f27..36f189c7ee8c 100644 --- a/drivers/ata/pata_at32.c +++ b/drivers/ata/pata_at32.c | |||
@@ -194,7 +194,7 @@ static int __init pata_at32_init_one(struct device *dev, | |||
194 | /* Setup ATA bindings */ | 194 | /* Setup ATA bindings */ |
195 | ap->ops = &at32_port_ops; | 195 | ap->ops = &at32_port_ops; |
196 | ap->pio_mask = PIO_MASK; | 196 | ap->pio_mask = PIO_MASK; |
197 | ap->flags |= ATA_FLAG_MMIO | ATA_FLAG_SLAVE_POSS; | 197 | ap->flags |= ATA_FLAG_SLAVE_POSS; |
198 | 198 | ||
199 | /* | 199 | /* |
200 | * Since all 8-bit taskfile transfers has to go on the lower | 200 | * Since all 8-bit taskfile transfers has to go on the lower |
diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c index 7aed5c792597..1086cacf3cf5 100644 --- a/drivers/ata/pata_bf54x.c +++ b/drivers/ata/pata_bf54x.c | |||
@@ -1455,7 +1455,6 @@ static struct ata_port_operations bfin_pata_ops = { | |||
1455 | static struct ata_port_info bfin_port_info[] = { | 1455 | static struct ata_port_info bfin_port_info[] = { |
1456 | { | 1456 | { |
1457 | .flags = ATA_FLAG_SLAVE_POSS | 1457 | .flags = ATA_FLAG_SLAVE_POSS |
1458 | | ATA_FLAG_MMIO | ||
1459 | | ATA_FLAG_NO_LEGACY, | 1458 | | ATA_FLAG_NO_LEGACY, |
1460 | .pio_mask = ATA_PIO4, | 1459 | .pio_mask = ATA_PIO4, |
1461 | .mwdma_mask = 0, | 1460 | .mwdma_mask = 0, |
diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c index ba54b089f98c..783ec4fc1119 100644 --- a/drivers/ata/pata_ixp4xx_cf.c +++ b/drivers/ata/pata_ixp4xx_cf.c | |||
@@ -177,7 +177,7 @@ static __devinit int ixp4xx_pata_probe(struct platform_device *pdev) | |||
177 | 177 | ||
178 | ap->ops = &ixp4xx_port_ops; | 178 | ap->ops = &ixp4xx_port_ops; |
179 | ap->pio_mask = ATA_PIO4; | 179 | ap->pio_mask = ATA_PIO4; |
180 | ap->flags |= ATA_FLAG_MMIO | ATA_FLAG_NO_LEGACY | ATA_FLAG_NO_ATAPI; | 180 | ap->flags |= ATA_FLAG_NO_LEGACY | ATA_FLAG_NO_ATAPI; |
181 | 181 | ||
182 | ixp4xx_setup_port(ap, data, cs0->start, cs1->start); | 182 | ixp4xx_setup_port(ap, data, cs0->start, cs1->start); |
183 | 183 | ||
diff --git a/drivers/ata/pata_macio.c b/drivers/ata/pata_macio.c index 75b49d01780b..7f7b883c008e 100644 --- a/drivers/ata/pata_macio.c +++ b/drivers/ata/pata_macio.c | |||
@@ -1053,8 +1053,7 @@ static int __devinit pata_macio_common_init(struct pata_macio_priv *priv, | |||
1053 | /* Allocate libata host for 1 port */ | 1053 | /* Allocate libata host for 1 port */ |
1054 | memset(&pinfo, 0, sizeof(struct ata_port_info)); | 1054 | memset(&pinfo, 0, sizeof(struct ata_port_info)); |
1055 | pmac_macio_calc_timing_masks(priv, &pinfo); | 1055 | pmac_macio_calc_timing_masks(priv, &pinfo); |
1056 | pinfo.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_MMIO | | 1056 | pinfo.flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_NO_LEGACY; |
1057 | ATA_FLAG_NO_LEGACY; | ||
1058 | pinfo.port_ops = &pata_macio_ops; | 1057 | pinfo.port_ops = &pata_macio_ops; |
1059 | pinfo.private_data = priv; | 1058 | pinfo.private_data = priv; |
1060 | 1059 | ||
diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c index fa1b95a9a7ff..18703e2e51c6 100644 --- a/drivers/ata/pata_octeon_cf.c +++ b/drivers/ata/pata_octeon_cf.c | |||
@@ -848,8 +848,8 @@ static int __devinit octeon_cf_probe(struct platform_device *pdev) | |||
848 | cf_port->ap = ap; | 848 | cf_port->ap = ap; |
849 | ap->ops = &octeon_cf_ops; | 849 | ap->ops = &octeon_cf_ops; |
850 | ap->pio_mask = ATA_PIO6; | 850 | ap->pio_mask = ATA_PIO6; |
851 | ap->flags |= ATA_FLAG_MMIO | ATA_FLAG_NO_LEGACY | 851 | ap->flags |= ATA_FLAG_NO_LEGACY | ATA_FLAG_NO_ATAPI |
852 | | ATA_FLAG_NO_ATAPI | ATA_FLAG_PIO_POLLING; | 852 | | ATA_FLAG_PIO_POLLING; |
853 | 853 | ||
854 | base = cs0 + ocd->base_region_bias; | 854 | base = cs0 + ocd->base_region_bias; |
855 | if (!ocd->is16bit) { | 855 | if (!ocd->is16bit) { |
diff --git a/drivers/ata/pata_palmld.c b/drivers/ata/pata_palmld.c index 11fb4ccc74b4..462a5fcebab9 100644 --- a/drivers/ata/pata_palmld.c +++ b/drivers/ata/pata_palmld.c | |||
@@ -85,7 +85,7 @@ static __devinit int palmld_pata_probe(struct platform_device *pdev) | |||
85 | ap = host->ports[0]; | 85 | ap = host->ports[0]; |
86 | ap->ops = &palmld_port_ops; | 86 | ap->ops = &palmld_port_ops; |
87 | ap->pio_mask = ATA_PIO4; | 87 | ap->pio_mask = ATA_PIO4; |
88 | ap->flags |= ATA_FLAG_MMIO | ATA_FLAG_NO_LEGACY | ATA_FLAG_PIO_POLLING; | 88 | ap->flags |= ATA_FLAG_NO_LEGACY | ATA_FLAG_PIO_POLLING; |
89 | 89 | ||
90 | /* memory mapping voodoo */ | 90 | /* memory mapping voodoo */ |
91 | ap->ioaddr.cmd_addr = mem + 0x10; | 91 | ap->ioaddr.cmd_addr = mem + 0x10; |
diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c index b18351122525..57ef92ce1a5c 100644 --- a/drivers/ata/pata_pdc2027x.c +++ b/drivers/ata/pata_pdc2027x.c | |||
@@ -150,8 +150,7 @@ static struct ata_port_operations pdc2027x_pata133_ops = { | |||
150 | static struct ata_port_info pdc2027x_port_info[] = { | 150 | static struct ata_port_info pdc2027x_port_info[] = { |
151 | /* PDC_UDMA_100 */ | 151 | /* PDC_UDMA_100 */ |
152 | { | 152 | { |
153 | .flags = ATA_FLAG_NO_LEGACY | ATA_FLAG_SLAVE_POSS | | 153 | .flags = ATA_FLAG_NO_LEGACY | ATA_FLAG_SLAVE_POSS, |
154 | ATA_FLAG_MMIO, | ||
155 | .pio_mask = ATA_PIO4, | 154 | .pio_mask = ATA_PIO4, |
156 | .mwdma_mask = ATA_MWDMA2, | 155 | .mwdma_mask = ATA_MWDMA2, |
157 | .udma_mask = ATA_UDMA5, | 156 | .udma_mask = ATA_UDMA5, |
@@ -159,8 +158,7 @@ static struct ata_port_info pdc2027x_port_info[] = { | |||
159 | }, | 158 | }, |
160 | /* PDC_UDMA_133 */ | 159 | /* PDC_UDMA_133 */ |
161 | { | 160 | { |
162 | .flags = ATA_FLAG_NO_LEGACY | ATA_FLAG_SLAVE_POSS | | 161 | .flags = ATA_FLAG_NO_LEGACY | ATA_FLAG_SLAVE_POSS, |
163 | ATA_FLAG_MMIO, | ||
164 | .pio_mask = ATA_PIO4, | 162 | .pio_mask = ATA_PIO4, |
165 | .mwdma_mask = ATA_MWDMA2, | 163 | .mwdma_mask = ATA_MWDMA2, |
166 | .udma_mask = ATA_UDMA6, | 164 | .udma_mask = ATA_UDMA6, |
diff --git a/drivers/ata/pata_pxa.c b/drivers/ata/pata_pxa.c index 1898c6ed4b4e..b4ede40f8ae1 100644 --- a/drivers/ata/pata_pxa.c +++ b/drivers/ata/pata_pxa.c | |||
@@ -292,7 +292,6 @@ static int __devinit pxa_ata_probe(struct platform_device *pdev) | |||
292 | ap->ops = &pxa_ata_port_ops; | 292 | ap->ops = &pxa_ata_port_ops; |
293 | ap->pio_mask = ATA_PIO4; | 293 | ap->pio_mask = ATA_PIO4; |
294 | ap->mwdma_mask = ATA_MWDMA2; | 294 | ap->mwdma_mask = ATA_MWDMA2; |
295 | ap->flags = ATA_FLAG_MMIO; | ||
296 | 295 | ||
297 | ap->ioaddr.cmd_addr = devm_ioremap(&pdev->dev, cmd_res->start, | 296 | ap->ioaddr.cmd_addr = devm_ioremap(&pdev->dev, cmd_res->start, |
298 | resource_size(cmd_res)); | 297 | resource_size(cmd_res)); |
diff --git a/drivers/ata/pata_rb532_cf.c b/drivers/ata/pata_rb532_cf.c index 0ffd631000b7..0365a5d714f6 100644 --- a/drivers/ata/pata_rb532_cf.c +++ b/drivers/ata/pata_rb532_cf.c | |||
@@ -91,7 +91,7 @@ static void rb532_pata_setup_ports(struct ata_host *ah) | |||
91 | 91 | ||
92 | ap->ops = &rb532_pata_port_ops; | 92 | ap->ops = &rb532_pata_port_ops; |
93 | ap->pio_mask = ATA_PIO4; | 93 | ap->pio_mask = ATA_PIO4; |
94 | ap->flags = ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO; | 94 | ap->flags = ATA_FLAG_NO_LEGACY; |
95 | 95 | ||
96 | ap->ioaddr.cmd_addr = info->iobase + RB500_CF_REG_BASE; | 96 | ap->ioaddr.cmd_addr = info->iobase + RB500_CF_REG_BASE; |
97 | ap->ioaddr.ctl_addr = info->iobase + RB500_CF_REG_CTRL; | 97 | ap->ioaddr.ctl_addr = info->iobase + RB500_CF_REG_CTRL; |
diff --git a/drivers/ata/pata_samsung_cf.c b/drivers/ata/pata_samsung_cf.c index 8a51d673e5b2..c446ae6055a3 100644 --- a/drivers/ata/pata_samsung_cf.c +++ b/drivers/ata/pata_samsung_cf.c | |||
@@ -531,7 +531,6 @@ static int __init pata_s3c_probe(struct platform_device *pdev) | |||
531 | } | 531 | } |
532 | 532 | ||
533 | ap = host->ports[0]; | 533 | ap = host->ports[0]; |
534 | ap->flags |= ATA_FLAG_MMIO; | ||
535 | ap->pio_mask = ATA_PIO4; | 534 | ap->pio_mask = ATA_PIO4; |
536 | 535 | ||
537 | if (cpu_type == TYPE_S3C64XX) { | 536 | if (cpu_type == TYPE_S3C64XX) { |
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c index 093715c3273a..5eb050086f38 100644 --- a/drivers/ata/pata_scc.c +++ b/drivers/ata/pata_scc.c | |||
@@ -959,7 +959,7 @@ static struct ata_port_operations scc_pata_ops = { | |||
959 | 959 | ||
960 | static struct ata_port_info scc_port_info[] = { | 960 | static struct ata_port_info scc_port_info[] = { |
961 | { | 961 | { |
962 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_MMIO | ATA_FLAG_NO_LEGACY, | 962 | .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_NO_LEGACY, |
963 | .pio_mask = ATA_PIO4, | 963 | .pio_mask = ATA_PIO4, |
964 | /* No MWDMA */ | 964 | /* No MWDMA */ |
965 | .udma_mask = ATA_UDMA6, | 965 | .udma_mask = ATA_UDMA6, |
diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c index adbe0426c8f0..384f202fbdec 100644 --- a/drivers/ata/pdc_adma.c +++ b/drivers/ata/pdc_adma.c | |||
@@ -167,8 +167,7 @@ static struct ata_port_info adma_port_info[] = { | |||
167 | /* board_1841_idx */ | 167 | /* board_1841_idx */ |
168 | { | 168 | { |
169 | .flags = ATA_FLAG_SLAVE_POSS | | 169 | .flags = ATA_FLAG_SLAVE_POSS | |
170 | ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO | | 170 | ATA_FLAG_NO_LEGACY | ATA_FLAG_PIO_POLLING, |
171 | ATA_FLAG_PIO_POLLING, | ||
172 | .pio_mask = ATA_PIO4_ONLY, | 171 | .pio_mask = ATA_PIO4_ONLY, |
173 | .udma_mask = ATA_UDMA4, | 172 | .udma_mask = ATA_UDMA4, |
174 | .port_ops = &adma_ata_ops, | 173 | .port_ops = &adma_ata_ops, |
diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c index 843af13606e1..8c37b0e7fad8 100644 --- a/drivers/ata/sata_dwc_460ex.c +++ b/drivers/ata/sata_dwc_460ex.c | |||
@@ -1619,7 +1619,7 @@ static struct ata_port_operations sata_dwc_ops = { | |||
1619 | static const struct ata_port_info sata_dwc_port_info[] = { | 1619 | static const struct ata_port_info sata_dwc_port_info[] = { |
1620 | { | 1620 | { |
1621 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 1621 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | |
1622 | ATA_FLAG_MMIO | ATA_FLAG_NCQ, | 1622 | ATA_FLAG_NCQ, |
1623 | .pio_mask = ATA_PIO4, | 1623 | .pio_mask = ATA_PIO4, |
1624 | .udma_mask = ATA_UDMA6, | 1624 | .udma_mask = ATA_UDMA6, |
1625 | .port_ops = &sata_dwc_ops, | 1625 | .port_ops = &sata_dwc_ops, |
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c index b0214d00d50b..1d70cf714275 100644 --- a/drivers/ata/sata_fsl.c +++ b/drivers/ata/sata_fsl.c | |||
@@ -34,8 +34,8 @@ enum { | |||
34 | SATA_FSL_MAX_PRD_DIRECT = 16, /* Direct PRDT entries */ | 34 | SATA_FSL_MAX_PRD_DIRECT = 16, /* Direct PRDT entries */ |
35 | 35 | ||
36 | SATA_FSL_HOST_FLAGS = (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 36 | SATA_FSL_HOST_FLAGS = (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | |
37 | ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA | | 37 | ATA_FLAG_PIO_DMA | ATA_FLAG_PMP | |
38 | ATA_FLAG_PMP | ATA_FLAG_NCQ | ATA_FLAG_AN), | 38 | ATA_FLAG_NCQ | ATA_FLAG_AN), |
39 | 39 | ||
40 | SATA_FSL_MAX_CMDS = SATA_FSL_QUEUE_DEPTH, | 40 | SATA_FSL_MAX_CMDS = SATA_FSL_QUEUE_DEPTH, |
41 | SATA_FSL_CMD_HDR_SIZE = 16, /* 4 DWORDS */ | 41 | SATA_FSL_CMD_HDR_SIZE = 16, /* 4 DWORDS */ |
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index bf74a36d3cc3..a2193fc52763 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c | |||
@@ -161,7 +161,7 @@ enum { | |||
161 | MV_FLAG_DUAL_HC = (1 << 30), /* two SATA Host Controllers */ | 161 | MV_FLAG_DUAL_HC = (1 << 30), /* two SATA Host Controllers */ |
162 | 162 | ||
163 | MV_COMMON_FLAGS = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 163 | MV_COMMON_FLAGS = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | |
164 | ATA_FLAG_MMIO | ATA_FLAG_PIO_POLLING, | 164 | ATA_FLAG_PIO_POLLING, |
165 | 165 | ||
166 | MV_GEN_I_FLAGS = MV_COMMON_FLAGS | ATA_FLAG_NO_ATAPI, | 166 | MV_GEN_I_FLAGS = MV_COMMON_FLAGS | ATA_FLAG_NO_ATAPI, |
167 | 167 | ||
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c index 7254e255fd78..cca96e89339d 100644 --- a/drivers/ata/sata_nv.c +++ b/drivers/ata/sata_nv.c | |||
@@ -567,7 +567,7 @@ static const struct ata_port_info nv_port_info[] = { | |||
567 | /* ADMA */ | 567 | /* ADMA */ |
568 | { | 568 | { |
569 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 569 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | |
570 | ATA_FLAG_MMIO | ATA_FLAG_NCQ, | 570 | ATA_FLAG_NCQ, |
571 | .pio_mask = NV_PIO_MASK, | 571 | .pio_mask = NV_PIO_MASK, |
572 | .mwdma_mask = NV_MWDMA_MASK, | 572 | .mwdma_mask = NV_MWDMA_MASK, |
573 | .udma_mask = NV_UDMA_MASK, | 573 | .udma_mask = NV_UDMA_MASK, |
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c index f03ad48273ff..b0cba3cd9361 100644 --- a/drivers/ata/sata_promise.c +++ b/drivers/ata/sata_promise.c | |||
@@ -135,7 +135,6 @@ enum { | |||
135 | PDC_RESET = (1 << 11), /* HDMA reset */ | 135 | PDC_RESET = (1 << 11), /* HDMA reset */ |
136 | 136 | ||
137 | PDC_COMMON_FLAGS = ATA_FLAG_NO_LEGACY | | 137 | PDC_COMMON_FLAGS = ATA_FLAG_NO_LEGACY | |
138 | ATA_FLAG_MMIO | | ||
139 | ATA_FLAG_PIO_POLLING, | 138 | ATA_FLAG_PIO_POLLING, |
140 | 139 | ||
141 | /* ap->flags bits */ | 140 | /* ap->flags bits */ |
diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c index daeebf19a6a9..5e30a7994391 100644 --- a/drivers/ata/sata_qstor.c +++ b/drivers/ata/sata_qstor.c | |||
@@ -156,7 +156,7 @@ static const struct ata_port_info qs_port_info[] = { | |||
156 | /* board_2068_idx */ | 156 | /* board_2068_idx */ |
157 | { | 157 | { |
158 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 158 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | |
159 | ATA_FLAG_MMIO | ATA_FLAG_PIO_POLLING, | 159 | ATA_FLAG_PIO_POLLING, |
160 | .pio_mask = ATA_PIO4_ONLY, | 160 | .pio_mask = ATA_PIO4_ONLY, |
161 | .udma_mask = ATA_UDMA6, | 161 | .udma_mask = ATA_UDMA6, |
162 | .port_ops = &qs_ata_ops, | 162 | .port_ops = &qs_ata_ops, |
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c index 3a4f84219719..0742d3d968e0 100644 --- a/drivers/ata/sata_sil.c +++ b/drivers/ata/sata_sil.c | |||
@@ -61,8 +61,7 @@ enum { | |||
61 | SIL_FLAG_RERR_ON_DMA_ACT = (1 << 29), | 61 | SIL_FLAG_RERR_ON_DMA_ACT = (1 << 29), |
62 | SIL_FLAG_MOD15WRITE = (1 << 30), | 62 | SIL_FLAG_MOD15WRITE = (1 << 30), |
63 | 63 | ||
64 | SIL_DFL_PORT_FLAGS = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 64 | SIL_DFL_PORT_FLAGS = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, |
65 | ATA_FLAG_MMIO, | ||
66 | 65 | ||
67 | /* | 66 | /* |
68 | * Controller IDs | 67 | * Controller IDs |
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c index af41c6fd1254..1ad7b94f0b38 100644 --- a/drivers/ata/sata_sil24.c +++ b/drivers/ata/sata_sil24.c | |||
@@ -245,9 +245,9 @@ enum { | |||
245 | 245 | ||
246 | /* host flags */ | 246 | /* host flags */ |
247 | SIL24_COMMON_FLAGS = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 247 | SIL24_COMMON_FLAGS = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | |
248 | ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA | | 248 | ATA_FLAG_PIO_DMA | ATA_FLAG_NCQ | |
249 | ATA_FLAG_NCQ | ATA_FLAG_ACPI_SATA | | 249 | ATA_FLAG_ACPI_SATA | ATA_FLAG_AN | |
250 | ATA_FLAG_AN | ATA_FLAG_PMP, | 250 | ATA_FLAG_PMP, |
251 | SIL24_FLAG_PCIX_IRQ_WOC = (1 << 24), /* IRQ loss errata on PCI-X */ | 251 | SIL24_FLAG_PCIX_IRQ_WOC = (1 << 24), /* IRQ loss errata on PCI-X */ |
252 | 252 | ||
253 | IRQ_STAT_4PORTS = 0xf, | 253 | IRQ_STAT_4PORTS = 0xf, |
diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c index 7d9db4aaf07e..adc913a35189 100644 --- a/drivers/ata/sata_svw.c +++ b/drivers/ata/sata_svw.c | |||
@@ -360,7 +360,7 @@ static const struct ata_port_info k2_port_info[] = { | |||
360 | /* chip_svw4 */ | 360 | /* chip_svw4 */ |
361 | { | 361 | { |
362 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 362 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | |
363 | ATA_FLAG_MMIO | K2_FLAG_NO_ATAPI_DMA, | 363 | K2_FLAG_NO_ATAPI_DMA, |
364 | .pio_mask = ATA_PIO4, | 364 | .pio_mask = ATA_PIO4, |
365 | .mwdma_mask = ATA_MWDMA2, | 365 | .mwdma_mask = ATA_MWDMA2, |
366 | .udma_mask = ATA_UDMA6, | 366 | .udma_mask = ATA_UDMA6, |
@@ -369,8 +369,7 @@ static const struct ata_port_info k2_port_info[] = { | |||
369 | /* chip_svw8 */ | 369 | /* chip_svw8 */ |
370 | { | 370 | { |
371 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 371 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | |
372 | ATA_FLAG_MMIO | K2_FLAG_NO_ATAPI_DMA | | 372 | K2_FLAG_NO_ATAPI_DMA | K2_FLAG_SATA_8_PORTS, |
373 | K2_FLAG_SATA_8_PORTS, | ||
374 | .pio_mask = ATA_PIO4, | 373 | .pio_mask = ATA_PIO4, |
375 | .mwdma_mask = ATA_MWDMA2, | 374 | .mwdma_mask = ATA_MWDMA2, |
376 | .udma_mask = ATA_UDMA6, | 375 | .udma_mask = ATA_UDMA6, |
@@ -379,7 +378,7 @@ static const struct ata_port_info k2_port_info[] = { | |||
379 | /* chip_svw42 */ | 378 | /* chip_svw42 */ |
380 | { | 379 | { |
381 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 380 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | |
382 | ATA_FLAG_MMIO | K2_FLAG_BAR_POS_3, | 381 | K2_FLAG_BAR_POS_3, |
383 | .pio_mask = ATA_PIO4, | 382 | .pio_mask = ATA_PIO4, |
384 | .mwdma_mask = ATA_MWDMA2, | 383 | .mwdma_mask = ATA_MWDMA2, |
385 | .udma_mask = ATA_UDMA6, | 384 | .udma_mask = ATA_UDMA6, |
@@ -387,8 +386,7 @@ static const struct ata_port_info k2_port_info[] = { | |||
387 | }, | 386 | }, |
388 | /* chip_svw43 */ | 387 | /* chip_svw43 */ |
389 | { | 388 | { |
390 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 389 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, |
391 | ATA_FLAG_MMIO, | ||
392 | .pio_mask = ATA_PIO4, | 390 | .pio_mask = ATA_PIO4, |
393 | .mwdma_mask = ATA_MWDMA2, | 391 | .mwdma_mask = ATA_MWDMA2, |
394 | .udma_mask = ATA_UDMA6, | 392 | .udma_mask = ATA_UDMA6, |
diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c index 76384d077b2d..d58e656bef70 100644 --- a/drivers/ata/sata_sx4.c +++ b/drivers/ata/sata_sx4.c | |||
@@ -274,8 +274,7 @@ static const struct ata_port_info pdc_port_info[] = { | |||
274 | /* board_20621 */ | 274 | /* board_20621 */ |
275 | { | 275 | { |
276 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 276 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | |
277 | ATA_FLAG_MMIO | ATA_FLAG_NO_ATAPI | | 277 | ATA_FLAG_NO_ATAPI | ATA_FLAG_PIO_POLLING, |
278 | ATA_FLAG_PIO_POLLING, | ||
279 | .pio_mask = ATA_PIO4, | 278 | .pio_mask = ATA_PIO4, |
280 | .mwdma_mask = ATA_MWDMA2, | 279 | .mwdma_mask = ATA_MWDMA2, |
281 | .udma_mask = ATA_UDMA6, | 280 | .udma_mask = ATA_UDMA6, |
diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c index e079cf29ed5d..192bdc7d8f6e 100644 --- a/drivers/ata/sata_vsc.c +++ b/drivers/ata/sata_vsc.c | |||
@@ -340,8 +340,7 @@ static int __devinit vsc_sata_init_one(struct pci_dev *pdev, | |||
340 | const struct pci_device_id *ent) | 340 | const struct pci_device_id *ent) |
341 | { | 341 | { |
342 | static const struct ata_port_info pi = { | 342 | static const struct ata_port_info pi = { |
343 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 343 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, |
344 | ATA_FLAG_MMIO, | ||
345 | .pio_mask = ATA_PIO4, | 344 | .pio_mask = ATA_PIO4, |
346 | .mwdma_mask = ATA_MWDMA2, | 345 | .mwdma_mask = ATA_MWDMA2, |
347 | .udma_mask = ATA_UDMA6, | 346 | .udma_mask = ATA_UDMA6, |
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index 6443ce7c41ae..e437c8ae9d41 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c | |||
@@ -6219,8 +6219,7 @@ static struct ata_port_operations ipr_sata_ops = { | |||
6219 | }; | 6219 | }; |
6220 | 6220 | ||
6221 | static struct ata_port_info sata_port_info = { | 6221 | static struct ata_port_info sata_port_info = { |
6222 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO | | 6222 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | ATA_FLAG_PIO_DMA, |
6223 | ATA_FLAG_PIO_DMA, | ||
6224 | .pio_mask = ATA_PIO4_ONLY, | 6223 | .pio_mask = ATA_PIO4_ONLY, |
6225 | .mwdma_mask = ATA_MWDMA2, | 6224 | .mwdma_mask = ATA_MWDMA2, |
6226 | .udma_mask = ATA_UDMA6, | 6225 | .udma_mask = ATA_UDMA6, |
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c index 996dbda47141..7538b6ffb3fe 100644 --- a/drivers/scsi/libsas/sas_ata.c +++ b/drivers/scsi/libsas/sas_ata.c | |||
@@ -372,8 +372,8 @@ static struct ata_port_operations sas_sata_ops = { | |||
372 | }; | 372 | }; |
373 | 373 | ||
374 | static struct ata_port_info sata_port_info = { | 374 | static struct ata_port_info sata_port_info = { |
375 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO | | 375 | .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | ATA_FLAG_PIO_DMA | |
376 | ATA_FLAG_PIO_DMA | ATA_FLAG_NCQ, | 376 | ATA_FLAG_NCQ, |
377 | .pio_mask = ATA_PIO4, | 377 | .pio_mask = ATA_PIO4, |
378 | .mwdma_mask = ATA_MWDMA2, | 378 | .mwdma_mask = ATA_MWDMA2, |
379 | .udma_mask = ATA_UDMA6, | 379 | .udma_mask = ATA_UDMA6, |
diff --git a/include/linux/libata.h b/include/linux/libata.h index 51ec439f75ad..0c3d9e144891 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
@@ -180,7 +180,6 @@ enum { | |||
180 | /* (doesn't imply presence) */ | 180 | /* (doesn't imply presence) */ |
181 | ATA_FLAG_SATA = (1 << 1), | 181 | ATA_FLAG_SATA = (1 << 1), |
182 | ATA_FLAG_NO_LEGACY = (1 << 2), /* no legacy mode check */ | 182 | ATA_FLAG_NO_LEGACY = (1 << 2), /* no legacy mode check */ |
183 | ATA_FLAG_MMIO = (1 << 3), /* use MMIO, not PIO */ | ||
184 | ATA_FLAG_NO_ATAPI = (1 << 6), /* No ATAPI support */ | 183 | ATA_FLAG_NO_ATAPI = (1 << 6), /* No ATAPI support */ |
185 | ATA_FLAG_PIO_DMA = (1 << 7), /* PIO cmds via DMA */ | 184 | ATA_FLAG_PIO_DMA = (1 << 7), /* PIO cmds via DMA */ |
186 | ATA_FLAG_PIO_LBA48 = (1 << 8), /* Host DMA engine is LBA28 only */ | 185 | ATA_FLAG_PIO_LBA48 = (1 << 8), /* Host DMA engine is LBA28 only */ |