diff options
author | Ryan Underwood <nemesis@icequake.net> | 2006-12-06 23:36:38 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:34 -0500 |
commit | c140e110019f25ffa1c6f3f365b0c9103d0b8475 (patch) | |
tree | 7a726a354c4b4302ab6bc7efe74cf105622d5e34 /drivers/parport | |
parent | d3b8b6e5f20031890e09a8eab72fd596d2e2227d (diff) |
[PATCH] parport_pc: Add support for OX16PCI952 parallel port
Add support for the parallel port (implemented as separate PCI function) on
the Oxford Semiconductor OX16PCI952.
Signed-off-by: Ryan Underwood <nemesis@icequake.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/parport')
-rw-r--r-- | drivers/parport/parport_pc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c index 39c96641bc72..5749500f45f0 100644 --- a/drivers/parport/parport_pc.c +++ b/drivers/parport/parport_pc.c | |||
@@ -2747,6 +2747,7 @@ enum parport_pc_pci_cards { | |||
2747 | titan_1284p2, | 2747 | titan_1284p2, |
2748 | avlab_1p, | 2748 | avlab_1p, |
2749 | avlab_2p, | 2749 | avlab_2p, |
2750 | oxsemi_952, | ||
2750 | oxsemi_954, | 2751 | oxsemi_954, |
2751 | oxsemi_840, | 2752 | oxsemi_840, |
2752 | aks_0100, | 2753 | aks_0100, |
@@ -2822,6 +2823,7 @@ static struct parport_pc_pci { | |||
2822 | /* avlab_2p */ { 2, { { 0, 1}, { 2, 3 },} }, | 2823 | /* avlab_2p */ { 2, { { 0, 1}, { 2, 3 },} }, |
2823 | /* The Oxford Semi cards are unusual: 954 doesn't support ECP, | 2824 | /* The Oxford Semi cards are unusual: 954 doesn't support ECP, |
2824 | * and 840 locks up if you write 1 to bit 2! */ | 2825 | * and 840 locks up if you write 1 to bit 2! */ |
2826 | /* oxsemi_952 */ { 1, { { 0, 1 }, } }, | ||
2825 | /* oxsemi_954 */ { 1, { { 0, -1 }, } }, | 2827 | /* oxsemi_954 */ { 1, { { 0, -1 }, } }, |
2826 | /* oxsemi_840 */ { 1, { { 0, -1 }, } }, | 2828 | /* oxsemi_840 */ { 1, { { 0, -1 }, } }, |
2827 | /* aks_0100 */ { 1, { { 0, -1 }, } }, | 2829 | /* aks_0100 */ { 1, { { 0, -1 }, } }, |
@@ -2895,6 +2897,8 @@ static const struct pci_device_id parport_pc_pci_tbl[] = { | |||
2895 | /* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/ | 2897 | /* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/ |
2896 | { 0x14db, 0x2120, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1p}, /* AFAVLAB_TK9902 */ | 2898 | { 0x14db, 0x2120, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1p}, /* AFAVLAB_TK9902 */ |
2897 | { 0x14db, 0x2121, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2p}, | 2899 | { 0x14db, 0x2121, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2p}, |
2900 | { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI952PP, | ||
2901 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_952 }, | ||
2898 | { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI954PP, | 2902 | { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI954PP, |
2899 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_954 }, | 2903 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_954 }, |
2900 | { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_12PCI840, | 2904 | { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_12PCI840, |