lkml.org 
[lkml]   [2006]   [Aug]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectPATCH: just a small update for the ALi driver
From
Date
Correct register for high dma mode
Turn on MWDMA
Correct linuxdoc

Signed-off-by: Alan Cox <alan@redhat.com>

--- linux.vanilla-2.6.18-rc3-mm2/drivers/scsi/pata_ali.c 2006-08-07 16:20:34.000000000 +0100
+++ linux-2.6.18-rc3-mm2/drivers/scsi/pata_ali.c 2006-08-07 16:36:32.000000000 +0100
@@ -34,7 +34,7 @@
#include <linux/dmi.h>

#define DRV_NAME "pata_ali"
-#define DRV_VERSION "0.6.4"
+#define DRV_VERSION "0.6.5"

/*
* Cable special cases
@@ -198,10 +198,10 @@
* @adev: Device the timing is for
* @cmd: Command timing
* @data: Data timing
- * @udma: UDMA timing or zero for off
+ * @ultra: UDMA timing or zero for off
*
* Loads the timing registers for cmd/data and disable UDMA if
- * udma is zero. If udma is set then load and enable the UDMA
+ * ultra is zero. If ultra is set then load and enable the UDMA
* timing but do not touch the command/data timing.
*/

@@ -292,10 +292,10 @@
if (adev->dma_mode >= XFER_UDMA_0) {
ali_program_modes(ap, adev, NULL, udma_timing[adev->dma_mode - XFER_UDMA_0]);
if (adev->dma_mode >= XFER_UDMA_3) {
- u8 reg54;
- pci_read_config_byte(pdev, 0x54, &reg54);
- reg54 |= 1;
- pci_write_config_byte(pdev, 0x54, reg54);
+ u8 reg4b;
+ pci_read_config_byte(pdev, 0x4B, &reg4b);
+ reg4b |= 1;
+ pci_write_config_byte(pdev, 0x4B, reg4b);
}
} else {
ata_timing_compute(adev, adev->dma_mode, &t, T, 1);
@@ -518,7 +518,7 @@
.sht = &ali_sht,
.host_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
.pio_mask = 0x1f,
- /*.mwdma_mask = 0x07,*/
+ .mwdma_mask = 0x07,
.port_ops = &ali_20_port_ops
};
/* Revision 0x20 with support logic added UDMA */
@@ -526,7 +526,7 @@
.sht = &ali_sht,
.host_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
.pio_mask = 0x1f,
- /*.mwdma_mask = 0x07, */
+ .mwdma_mask = 0x07,
.udma_mask = 0x07, /* UDMA33 */
.port_ops = &ali_20_port_ops
};
@@ -535,7 +535,7 @@
.sht = &ali_sht,
.host_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
.pio_mask = 0x1f,
- /*.mwdma_mask = 0x07, */
+ .mwdma_mask = 0x07,
.udma_mask = 0x1f,
.port_ops = &ali_c2_port_ops
};
@@ -544,7 +544,7 @@
.sht = &ali_sht,
.host_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
.pio_mask = 0x1f,
- /* .mwdma_mask = 0x07, */
+ .mwdma_mask = 0x07,
.udma_mask = 0x3f,
.port_ops = &ali_c2_port_ops
};
@@ -553,7 +553,7 @@
.sht = &ali_sht,
.host_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST | ATA_FLAG_PIO_LBA48,
.pio_mask = 0x1f,
- /* .mwdma_mask = 0x07, */
+ .mwdma_mask = 0x07,
.udma_mask = 0x7f,
.port_ops = &ali_c2_port_ops
};
@@ -562,7 +562,7 @@
.sht = &ali_sht,
.host_flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
.pio_mask = 0x1f,
- /* .mwdma_mask = 0x07, */
+ .mwdma_mask = 0x07,
.udma_mask = 0x7f,
.port_ops = &ali_c5_port_ops
};
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2006-08-08 13:49    [W:0.030 / U:0.340 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site