diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2008-01-19 11:07:58 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2008-01-23 05:24:17 -0500 |
commit | 5e8f757cb2e0f67bf43f71d5180a8bf0ab3484eb (patch) | |
tree | e4dc17cffedc3211eb1c6e373b0781379658dd04 /drivers/ata | |
parent | 3e9b90265e9ab191c8f7e072fd0abf05824d2f1b (diff) |
ata_generic: Cenatek support
Not much to do here. It's an ata memory as disk.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r-- | drivers/ata/ata_generic.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c index d11a4f1fe86a..20534202fc79 100644 --- a/drivers/ata/ata_generic.c +++ b/drivers/ata/ata_generic.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include <linux/libata.h> | 26 | #include <linux/libata.h> |
27 | 27 | ||
28 | #define DRV_NAME "ata_generic" | 28 | #define DRV_NAME "ata_generic" |
29 | #define DRV_VERSION "0.2.13" | 29 | #define DRV_VERSION "0.2.15" |
30 | 30 | ||
31 | /* | 31 | /* |
32 | * A generic parallel ATA driver using libata | 32 | * A generic parallel ATA driver using libata |
@@ -48,11 +48,15 @@ static int generic_set_mode(struct ata_link *link, struct ata_device **unused) | |||
48 | struct ata_port *ap = link->ap; | 48 | struct ata_port *ap = link->ap; |
49 | int dma_enabled = 0; | 49 | int dma_enabled = 0; |
50 | struct ata_device *dev; | 50 | struct ata_device *dev; |
51 | struct pci_dev *pdev = to_pci_dev(ap->host->dev); | ||
51 | 52 | ||
52 | /* Bits 5 and 6 indicate if DMA is active on master/slave */ | 53 | /* Bits 5 and 6 indicate if DMA is active on master/slave */ |
53 | if (ap->ioaddr.bmdma_addr) | 54 | if (ap->ioaddr.bmdma_addr) |
54 | dma_enabled = ioread8(ap->ioaddr.bmdma_addr + ATA_DMA_STATUS); | 55 | dma_enabled = ioread8(ap->ioaddr.bmdma_addr + ATA_DMA_STATUS); |
55 | 56 | ||
57 | if (pdev->vendor == PCI_VENDOR_ID_CENATEK) | ||
58 | dma_enabled = 0xFF; | ||
59 | |||
56 | ata_link_for_each_dev(dev, link) { | 60 | ata_link_for_each_dev(dev, link) { |
57 | if (!ata_dev_enabled(dev)) | 61 | if (!ata_dev_enabled(dev)) |
58 | continue; | 62 | continue; |
@@ -201,6 +205,7 @@ static struct pci_device_id ata_generic[] = { | |||
201 | { PCI_DEVICE(PCI_VENDOR_ID_HINT, PCI_DEVICE_ID_HINT_VXPROII_IDE), }, | 205 | { PCI_DEVICE(PCI_VENDOR_ID_HINT, PCI_DEVICE_ID_HINT_VXPROII_IDE), }, |
202 | { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C561), }, | 206 | { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C561), }, |
203 | { PCI_DEVICE(PCI_VENDOR_ID_OPTI, PCI_DEVICE_ID_OPTI_82C558), }, | 207 | { PCI_DEVICE(PCI_VENDOR_ID_OPTI, PCI_DEVICE_ID_OPTI_82C558), }, |
208 | { PCI_DEVICE(PCI_VENDOR_ID_CENATEK,PCI_DEVICE_ID_CENATEK_IDE), }, | ||
204 | { PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO), }, | 209 | { PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO), }, |
205 | { PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_1), }, | 210 | { PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_1), }, |
206 | { PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_2), }, | 211 | { PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_2), }, |