aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvaylo Josifov <ivaylo@bglans.net>2008-09-06 19:21:27 +0200
committerWilly Tarreau <w@1wt.eu>2008-09-06 19:21:27 +0200
commit39a14193a9e5d8263365bca9b26b73382727e00c (patch)
tree11b1e942b5162a637017661f84354718767924c4
parentc20ccc55e05bfa482d5ba4c98035ce5a3533e8aa (diff)
downloadlinux-2.4-39a14193a9e5d8263365bca9b26b73382727e00c.tar.gz
ide-generic: Marvell IDE 88SE6101 2.4.XX support
Another one small patch to support Marvell IDE 88SE6101 controller. I have one on Intel DG33BU motherboard. It is detected as 02:00.0 IDE interface: Marvell Technology Group Ltd. 88SE6101 single-port PATA133 interface (rev b2) I add it in kernel as generic IDE. This patch and the other which is to support ICH9 AHCI works for me from few month. Signed-off-by: Willy Tarreau <w@1wt.eu>
-rw-r--r--drivers/ide/pci/generic.c1
-rw-r--r--drivers/ide/pci/generic.h10
-rw-r--r--include/linux/pci_ids.h3
3 files changed, 14 insertions, 0 deletions
diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
index bcc5a692945a9..c45034a1f6bed 100644
--- a/drivers/ide/pci/generic.c
+++ b/drivers/ide/pci/generic.c
@@ -144,6 +144,7 @@ static struct pci_device_id generic_pci_tbl[] __devinitdata = {
{ PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_TOSHIBA_PICCOLO_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 10},
{ PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_TOSHIBA_PICCOLO_2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 11},
{ PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_20363, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 12},
+ { PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_6101, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 13},
{ 0, },
};
diff --git a/drivers/ide/pci/generic.h b/drivers/ide/pci/generic.h
index 759018bfb88ac..589b0302fa738 100644
--- a/drivers/ide/pci/generic.h
+++ b/drivers/ide/pci/generic.h
@@ -167,6 +167,16 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
.channels = 1,
.autodma = NOAUTODMA,
.bootable = ON_BOARD,
+ },{ /* 13 */
+ .vendor = PCI_VENDOR_ID_MARVELL,
+ .device = PCI_DEVICE_ID_MARVELL_6101,
+ .name = "MARVELL_6101",
+ .init_chipset = init_chipset_generic,
+ .init_hwif = init_hwif_generic,
+ .init_dma = init_dma_generic,
+ .channels = 1,
+ .autodma = NOAUTODMA,
+ .bootable = ON_BOARD,
},{
.vendor = 0,
.device = 0,
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 6a1bd634eaba5..5438bbdecf04f 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2111,3 +2111,6 @@
#define PCI_VENDOR_ID_JMICRON 0x197b
#define PCI_DEVICE_ID_JMICRON_20363 0x2363
+#define PCI_VENDOR_ID_MARVELL 0x11ab
+#define PCI_DEVICE_ID_MARVELL_6101 0x6101
+