The patch titled
IDE: small update for the ALi driver
has been removed from the -mm tree. Its filename is
ide-small-update-for-the-ali-driver.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: IDE: small update for the ALi driver
From: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Correct register for high dma mode
Turn on MWDMA
Correct linuxdoc
Signed-off-by: Alan Cox <alan@xxxxxxxxxx>
Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ata/pata_ali.c | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff -puN drivers/ata/pata_ali.c~ide-small-update-for-the-ali-driver drivers/scsi/pata_ali.c
--- a/drivers/ata/pata_ali.c~ide-small-update-for-the-ali-driver
+++ a/drivers/ata/pata_ali.c
@@ -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 @@ static void ali_fifo_control(struct ata_
* @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 @@ static void ali_set_dmamode(struct ata_p
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, ®54);
- reg54 |= 1;
- pci_write_config_byte(pdev, 0x54, reg54);
+ u8 reg4b;
+ pci_read_config_byte(pdev, 0x4B, ®4b);
+ reg4b |= 1;
+ pci_write_config_byte(pdev, 0x4B, reg4b);
}
} else {
ata_timing_compute(adev, adev->dma_mode, &t, T, 1);
@@ -518,7 +518,7 @@ static int ali_init_one(struct pci_dev *
.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 @@ static int ali_init_one(struct pci_dev *
.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 @@ static int ali_init_one(struct pci_dev *
.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 @@ static int ali_init_one(struct pci_dev *
.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 @@ static int ali_init_one(struct pci_dev *
.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 @@ static int ali_init_one(struct pci_dev *
.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
};
_
Patches currently in -mm which might be from alan@xxxxxxxxxxxxxxxxxxx are
tty-layer-comment-the-locking-assumptions-and-functions.patch
fix-tty-layer-dos-and-comment-relevant-code.patch
git-libata-all.patch
1-of-2-jmicron-driver.patch
2-of-2-jmicron-driver-plumbing-and-quirk.patch
non-libata-driver-for-jmicron-devices.patch
via-pata-controller-xfer-fixes.patch
git-net.patch
netfilter-make-unused-signal-code-go-away-so-nobody-copies-its-broken-ness.patch
megaraid-gcc-41-warning-fix.patch
voyager-tty-locking.patch
edac-new-opteron-athlon64-memory-controller-driver.patch
edac-new-opteron-athlon64-memory-controller-driver-tidy.patch
sanitize-3c589_cs.patch
make-prot_write-imply-prot_read.patch
sgiioc4-fixup-use-of-mmio-ops.patch
remove-unused-tty_struct-variable.patch
there-is-no-devfs-there-has-never-been-a-devfs-we-have.patch
tty-locking-on-resize.patch
ahci-ati-sb600-sata-support-for-various-modes.patch
atiixp-ati-sb600-ide-support-for-various-modes.patch
add-full-compact-flash-support-to-libata.patch
ide-claim-extra-dma-ports-regardless-of-channel.patch
ide-always-release-dma-engine.patch
ide-error-handling-fixes.patch
ide-hpt3xxn-clocking-fixes.patch
ide-fix-hpt37x-timing-tables.patch
ide-optimize-hpt37x-timing-tables.patch
ide-fix-hpt3xx-hotswap-support.patch
ide-fix-the-case-of-multiple-hpt3xx-chips-present.patch
ide-hpt3xx-fix-pci-clock-detection.patch
ide-hpt3xx-fix-pci-clock-detection-fix-2.patch
piix-fix-82371mx-enablebits.patch
piix-remove-check-for-broken-mw-dma-mode-0.patch
piix-slc90e66-pio-mode-fallback-fix.patch
make-number-of-ide-interfaces-configurable.patch
ide_dma_speed-fixes.patch
hpt3xx-rework-rate-filtering.patch
hpt3xx-rework-rate-filtering-tidy.patch
hpt3xx-print-the-real-chip-name-at-startup.patch
hpt3xx-switch-to-using-pci_get_slot.patch
hpt3xx-cache-channels-mcr-address.patch
hpt3x7-merge-speedproc-handlers.patch
hpt370-clean-up-dma-timeout-handling.patch
enable-cdrom-dma-access-with-pdc20265_old.patch
ide-fix-revision-comparison-in-ide_in_drive_list.patch
ide-backport-piix-fixes-from-libata-into-the-legacy-driver.patch
hpt3xx-init-code-rewrite.patch
move-ide-to-unmaintained-drop-reference-to-old-git-tree.patch
drivers-ide-cleanups.patch
ide-remove-dma_base2-field-from-ide_hwif_t.patch
ide-reprogram-disk-pio-timings-on-resume.patch
asus-mv-ide-device-ids.patch
ide-support-for-via-8237a-southbridge.patch
config_pm=n-slim-drivers-ide-pci-sc1200c.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
