summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2010-03-01 07:32:49 +0000
committermav <mav@FreeBSD.org>2010-03-01 07:32:49 +0000
commit28397927dec2e962cf44ecbc5b1066b5b8f390ef (patch)
treefc91434479113dbde651e01573c3cd9df0d43cc9
parent6c94ea5b8def520d68000f11d54e509022f2437d (diff)
downloadFreeBSD-src-28397927dec2e962cf44ecbc5b1066b5b8f390ef.zip
FreeBSD-src-28397927dec2e962cf44ecbc5b1066b5b8f390ef.tar.gz
- Add ALI M5228 PATA ID.
- Add missed DMA initialization for ALI SATA chips.
-rw-r--r--sys/dev/ata/ata-pci.h1
-rw-r--r--sys/dev/ata/chipsets/ata-acerlabs.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/ata/ata-pci.h b/sys/dev/ata/ata-pci.h
index b9c535c..1378f87 100644
--- a/sys/dev/ata/ata-pci.h
+++ b/sys/dev/ata/ata-pci.h
@@ -84,6 +84,7 @@ struct ata_pci_controller {
#define ATA_ACER_LABS_ID 0x10b9
#define ATA_ALI_1533 0x153310b9
+#define ATA_ALI_5228 0x522810b9
#define ATA_ALI_5229 0x522910b9
#define ATA_ALI_5281 0x528110b9
#define ATA_ALI_5287 0x528710b9
diff --git a/sys/dev/ata/chipsets/ata-acerlabs.c b/sys/dev/ata/chipsets/ata-acerlabs.c
index b5036d7..b7f1147 100644
--- a/sys/dev/ata/chipsets/ata-acerlabs.c
+++ b/sys/dev/ata/chipsets/ata-acerlabs.c
@@ -79,6 +79,7 @@ ata_ali_probe(device_t dev)
{ ATA_ALI_5288, 0x00, 4, ALI_SATA, ATA_SA300, "M5288" },
{ ATA_ALI_5287, 0x00, 4, ALI_SATA, ATA_SA150, "M5287" },
{ ATA_ALI_5281, 0x00, 2, ALI_SATA, ATA_SA150, "M5281" },
+ { ATA_ALI_5228, 0xc5, 0, ALI_NEW, ATA_UDMA6, "M5228" },
{ ATA_ALI_5229, 0xc5, 0, ALI_NEW, ATA_UDMA6, "M5229" },
{ ATA_ALI_5229, 0xc4, 0, ALI_NEW, ATA_UDMA5, "M5229" },
{ ATA_ALI_5229, 0xc2, 0, ALI_NEW, ATA_UDMA4, "M5229" },
@@ -208,7 +209,7 @@ ata_ali_sata_ch_attach(device_t dev)
io = res->bars[0];
ctlio = res->bars[1];
}
-
+ ata_pci_dmainit(dev);
for (i = ATA_DATA; i <= ATA_COMMAND; i ++) {
ch->r_io[i].res = io;
ch->r_io[i].offset = i + (unit10 ? 8 : 0);
OpenPOWER on IntegriCloud