Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c140e110 authored by Ryan Underwood's avatar Ryan Underwood Committed by Linus Torvalds
Browse files

[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: default avatarRyan Underwood <nemesis@icequake.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d3b8b6e5

drivers/parport/parport_pc.c

+4 −0
Original line number Diff line number Diff line
@@ -2747,6 +2747,7 @@ enum parport_pc_pci_cards { 
	titan_1284p2,

	avlab_1p,

	avlab_2p,

	oxsemi_952,

	oxsemi_954,

	oxsemi_840,

	aks_0100,
@@ -2822,6 +2823,7 @@ static struct parport_pc_pci { 
	/* avlab_2p		*/	{ 2, { { 0, 1}, { 2, 3 },} },

	/* The Oxford Semi cards are unusual: 954 doesn't support ECP,

	 * and 840 locks up if you write 1 to bit 2! */

	/* oxsemi_952 */		{ 1, { { 0, 1 }, } },

	/* oxsemi_954 */		{ 1, { { 0, -1 }, } },

	/* oxsemi_840 */		{ 1, { { 0, -1 }, } },

	/* aks_0100 */                  { 1, { { 0, -1 }, } },
@@ -2895,6 +2897,8 @@ static const struct pci_device_id parport_pc_pci_tbl[] = { 
	/* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/

	{ 0x14db, 0x2120, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1p}, /* AFAVLAB_TK9902 */

	{ 0x14db, 0x2121, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2p},

	{ PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI952PP,

	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_952 },

	{ PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI954PP,

	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_954 },

	{ PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_12PCI840,

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -1864,6 +1864,7 @@ 
#define PCI_DEVICE_ID_OXSEMI_16PCI95N	0x9511

#define PCI_DEVICE_ID_OXSEMI_16PCI954PP	0x9513

#define PCI_DEVICE_ID_OXSEMI_16PCI952	0x9521

#define PCI_DEVICE_ID_OXSEMI_16PCI952PP	0x9523



#define PCI_VENDOR_ID_SAMSUNG		0x144d