Commit a6df7da8 authored by Kylene Hall's avatar Kylene Hall Committed by Linus Torvalds
Browse files

[PATCH] tpm: TPMs on additional LPC bus 



Add support for TPMs on additional LPC buses.

Signed-off-by: default avatarKylene Hall <kjhall@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5e976d55

drivers/char/tpm/tpm_atmel.c

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ static struct pci_device_id tpm_pci_tbl[] __devinitdata = { 
	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12)},

	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0)},

	{PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_LPC)},

	{PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6LPC)},

	{0,}

};

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -1568,6 +1568,7 @@ 
#define PCI_DEVICE_ID_SERVERWORKS_OSB4USB 0x0220

#define PCI_DEVICE_ID_SERVERWORKS_CSB5USB PCI_DEVICE_ID_SERVERWORKS_OSB4USB

#define PCI_DEVICE_ID_SERVERWORKS_CSB6USB 0x0221

#define PCI_DEVICE_ID_SERVERWORKS_CSB6LPC 0x0227

#define PCI_DEVICE_ID_SERVERWORKS_GCLE    0x0225

#define PCI_DEVICE_ID_SERVERWORKS_GCLE2   0x0227

#define PCI_DEVICE_ID_SERVERWORKS_CSB5ISA 0x0230