diff options
author | Olivier Blin <oblin@mandriva.com> | 2005-07-27 14:43:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-27 19:25:51 -0400 |
commit | 49f29915856435ad8e34a4a3a907b09682a5826e (patch) | |
tree | 27faa6ed2fa2d6d11728ffcf4bc96fdd0e1deb4b /drivers/isdn/hisax | |
parent | b24b1033451fcc87087a692fc47ca45daebd51ac (diff) |
[PATCH] i4l: add Olitec ISDN PCI card in hisax gazel driver
This patch adds support for the Olitec ISDN PCI card in the hisax gazel
driver. The gazel driver supports this card, but wasn't aware of its PCI
ids. Users used to modify the PCI ids of a supported card in
include/linux/pci_ids.h and recompile their kernel to get this card
running, as said in most Howtos. This patch makes the hisax gazel driver
recognize the PCI ids of the Olitec ISDN PCI card.
Signed-off-by: Olivier Blin <oblin@mandriva.com>
Signed-off-by: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/isdn/hisax')
-rw-r--r-- | drivers/isdn/hisax/config.c | 1 | ||||
-rw-r--r-- | drivers/isdn/hisax/gazel.c | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c index c542e6fb2bde..fbaab4352902 100644 --- a/drivers/isdn/hisax/config.c +++ b/drivers/isdn/hisax/config.c | |||
@@ -1900,6 +1900,7 @@ static struct pci_device_id hisax_pci_tbl[] __initdata = { | |||
1900 | {PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_R685, PCI_ANY_ID, PCI_ANY_ID}, | 1900 | {PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_R685, PCI_ANY_ID, PCI_ANY_ID}, |
1901 | {PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_R753, PCI_ANY_ID, PCI_ANY_ID}, | 1901 | {PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_R753, PCI_ANY_ID, PCI_ANY_ID}, |
1902 | {PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_DJINN_ITOO, PCI_ANY_ID, PCI_ANY_ID}, | 1902 | {PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_DJINN_ITOO, PCI_ANY_ID, PCI_ANY_ID}, |
1903 | {PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_OLITEC, PCI_ANY_ID, PCI_ANY_ID}, | ||
1903 | #endif | 1904 | #endif |
1904 | #ifdef CONFIG_HISAX_QUADRO | 1905 | #ifdef CONFIG_HISAX_QUADRO |
1905 | {PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_ANY_ID, PCI_ANY_ID}, | 1906 | {PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_ANY_ID, PCI_ANY_ID}, |
diff --git a/drivers/isdn/hisax/gazel.c b/drivers/isdn/hisax/gazel.c index 352b45ac5347..60b04c6d9e7d 100644 --- a/drivers/isdn/hisax/gazel.c +++ b/drivers/isdn/hisax/gazel.c | |||
@@ -546,8 +546,9 @@ setup_gazelpci(struct IsdnCardState *cs) | |||
546 | 546 | ||
547 | found = 0; | 547 | found = 0; |
548 | seekcard = PCI_DEVICE_ID_PLX_R685; | 548 | seekcard = PCI_DEVICE_ID_PLX_R685; |
549 | for (nbseek = 0; nbseek < 3; nbseek++) { | 549 | for (nbseek = 0; nbseek < 4; nbseek++) { |
550 | if ((dev_tel = pci_find_device(PCI_VENDOR_ID_PLX, seekcard, dev_tel))) { | 550 | if ((dev_tel = pci_find_device(PCI_VENDOR_ID_PLX, |
551 | seekcard, dev_tel))) { | ||
551 | if (pci_enable_device(dev_tel)) | 552 | if (pci_enable_device(dev_tel)) |
552 | return 1; | 553 | return 1; |
553 | pci_irq = dev_tel->irq; | 554 | pci_irq = dev_tel->irq; |
@@ -565,6 +566,9 @@ setup_gazelpci(struct IsdnCardState *cs) | |||
565 | case PCI_DEVICE_ID_PLX_R753: | 566 | case PCI_DEVICE_ID_PLX_R753: |
566 | seekcard = PCI_DEVICE_ID_PLX_DJINN_ITOO; | 567 | seekcard = PCI_DEVICE_ID_PLX_DJINN_ITOO; |
567 | break; | 568 | break; |
569 | case PCI_DEVICE_ID_PLX_DJINN_ITOO: | ||
570 | seekcard = PCI_DEVICE_ID_PLX_OLITEC; | ||
571 | break; | ||
568 | } | 572 | } |
569 | } | 573 | } |
570 | } | 574 | } |
@@ -605,6 +609,7 @@ setup_gazelpci(struct IsdnCardState *cs) | |||
605 | break; | 609 | break; |
606 | case PCI_DEVICE_ID_PLX_R753: | 610 | case PCI_DEVICE_ID_PLX_R753: |
607 | case PCI_DEVICE_ID_PLX_DJINN_ITOO: | 611 | case PCI_DEVICE_ID_PLX_DJINN_ITOO: |
612 | case PCI_DEVICE_ID_PLX_OLITEC: | ||
608 | printk(KERN_INFO "Gazel: Card PCI R753 found\n"); | 613 | printk(KERN_INFO "Gazel: Card PCI R753 found\n"); |
609 | cs->subtyp = R753; | 614 | cs->subtyp = R753; |
610 | test_and_set_bit(HW_IPAC, &cs->HW_Flags); | 615 | test_and_set_bit(HW_IPAC, &cs->HW_Flags); |