diff options
Diffstat (limited to 'drivers/ata/sata_sil.c')
-rw-r--r-- | drivers/ata/sata_sil.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c index a3b339bcf3cf..2a86dc4598d0 100644 --- a/drivers/ata/sata_sil.c +++ b/drivers/ata/sata_sil.c | |||
@@ -218,7 +218,7 @@ static const struct ata_port_info sil_port_info[] = { | |||
218 | .flags = SIL_DFL_PORT_FLAGS | SIL_FLAG_MOD15WRITE, | 218 | .flags = SIL_DFL_PORT_FLAGS | SIL_FLAG_MOD15WRITE, |
219 | .pio_mask = 0x1f, /* pio0-4 */ | 219 | .pio_mask = 0x1f, /* pio0-4 */ |
220 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 220 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
221 | .udma_mask = 0x3f, /* udma0-5 */ | 221 | .udma_mask = ATA_UDMA5, |
222 | .port_ops = &sil_ops, | 222 | .port_ops = &sil_ops, |
223 | }, | 223 | }, |
224 | /* sil_3112_no_sata_irq */ | 224 | /* sil_3112_no_sata_irq */ |
@@ -227,7 +227,7 @@ static const struct ata_port_info sil_port_info[] = { | |||
227 | SIL_FLAG_NO_SATA_IRQ, | 227 | SIL_FLAG_NO_SATA_IRQ, |
228 | .pio_mask = 0x1f, /* pio0-4 */ | 228 | .pio_mask = 0x1f, /* pio0-4 */ |
229 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 229 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
230 | .udma_mask = 0x3f, /* udma0-5 */ | 230 | .udma_mask = ATA_UDMA5, |
231 | .port_ops = &sil_ops, | 231 | .port_ops = &sil_ops, |
232 | }, | 232 | }, |
233 | /* sil_3512 */ | 233 | /* sil_3512 */ |
@@ -235,7 +235,7 @@ static const struct ata_port_info sil_port_info[] = { | |||
235 | .flags = SIL_DFL_PORT_FLAGS | SIL_FLAG_RERR_ON_DMA_ACT, | 235 | .flags = SIL_DFL_PORT_FLAGS | SIL_FLAG_RERR_ON_DMA_ACT, |
236 | .pio_mask = 0x1f, /* pio0-4 */ | 236 | .pio_mask = 0x1f, /* pio0-4 */ |
237 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 237 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
238 | .udma_mask = 0x3f, /* udma0-5 */ | 238 | .udma_mask = ATA_UDMA5, |
239 | .port_ops = &sil_ops, | 239 | .port_ops = &sil_ops, |
240 | }, | 240 | }, |
241 | /* sil_3114 */ | 241 | /* sil_3114 */ |
@@ -243,7 +243,7 @@ static const struct ata_port_info sil_port_info[] = { | |||
243 | .flags = SIL_DFL_PORT_FLAGS | SIL_FLAG_RERR_ON_DMA_ACT, | 243 | .flags = SIL_DFL_PORT_FLAGS | SIL_FLAG_RERR_ON_DMA_ACT, |
244 | .pio_mask = 0x1f, /* pio0-4 */ | 244 | .pio_mask = 0x1f, /* pio0-4 */ |
245 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 245 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
246 | .udma_mask = 0x3f, /* udma0-5 */ | 246 | .udma_mask = ATA_UDMA5, |
247 | .port_ops = &sil_ops, | 247 | .port_ops = &sil_ops, |
248 | }, | 248 | }, |
249 | }; | 249 | }; |
@@ -262,8 +262,9 @@ static const struct { | |||
262 | unsigned long sfis_cfg; /* SATA FIS reception config register */ | 262 | unsigned long sfis_cfg; /* SATA FIS reception config register */ |
263 | } sil_port[] = { | 263 | } sil_port[] = { |
264 | /* port 0 ... */ | 264 | /* port 0 ... */ |
265 | { 0x80, 0x8A, 0x00, 0x10, 0x40, 0x100, 0x148, 0xb4, 0x14c }, | 265 | /* tf ctl bmdma bmdma2 fifo scr sien mode sfis */ |
266 | { 0xC0, 0xCA, 0x08, 0x18, 0x44, 0x180, 0x1c8, 0xf4, 0x1cc }, | 266 | { 0x80, 0x8A, 0x0, 0x10, 0x40, 0x100, 0x148, 0xb4, 0x14c }, |
267 | { 0xC0, 0xCA, 0x8, 0x18, 0x44, 0x180, 0x1c8, 0xf4, 0x1cc }, | ||
267 | { 0x280, 0x28A, 0x200, 0x210, 0x240, 0x300, 0x348, 0x2b4, 0x34c }, | 268 | { 0x280, 0x28A, 0x200, 0x210, 0x240, 0x300, 0x348, 0x2b4, 0x34c }, |
268 | { 0x2C0, 0x2CA, 0x208, 0x218, 0x244, 0x380, 0x3c8, 0x2f4, 0x3cc }, | 269 | { 0x2C0, 0x2CA, 0x208, 0x218, 0x244, 0x380, 0x3c8, 0x2f4, 0x3cc }, |
269 | /* ... port 3 */ | 270 | /* ... port 3 */ |