diff options
-rw-r--r-- | drivers/misc/tifm_7xx1.c | 13 | ||||
-rw-r--r-- | include/linux/pci_ids.h | 3 |
2 files changed, 11 insertions, 5 deletions
diff --git a/drivers/misc/tifm_7xx1.c b/drivers/misc/tifm_7xx1.c index d3e8ff46c237..ea6ad9f2d245 100644 --- a/drivers/misc/tifm_7xx1.c +++ b/drivers/misc/tifm_7xx1.c | |||
@@ -350,7 +350,8 @@ static int tifm_7xx1_probe(struct pci_dev *dev, | |||
350 | } | 350 | } |
351 | 351 | ||
352 | fm->dev = &dev->dev; | 352 | fm->dev = &dev->dev; |
353 | fm->num_sockets = (dev->device == 0x803B) ? 2 : 4; | 353 | fm->num_sockets = (dev->device == PCI_DEVICE_ID_TI_XX21_XX11_FM) |
354 | ? 4 : 2; | ||
354 | fm->sockets = kzalloc(sizeof(struct tifm_dev*) * fm->num_sockets, | 355 | fm->sockets = kzalloc(sizeof(struct tifm_dev*) * fm->num_sockets, |
355 | GFP_KERNEL); | 356 | GFP_KERNEL); |
356 | if (!fm->sockets) | 357 | if (!fm->sockets) |
@@ -423,10 +424,12 @@ static void tifm_7xx1_remove(struct pci_dev *dev) | |||
423 | } | 424 | } |
424 | 425 | ||
425 | static struct pci_device_id tifm_7xx1_pci_tbl [] = { | 426 | static struct pci_device_id tifm_7xx1_pci_tbl [] = { |
426 | { PCI_VENDOR_ID_TI, 0x8033, PCI_ANY_ID, PCI_ANY_ID, 0, 0, | 427 | { PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_XX21_XX11_FM, PCI_ANY_ID, |
427 | 0 }, /* xx21 - the one I have */ | 428 | PCI_ANY_ID, 0, 0, 0 }, /* xx21 - the one I have */ |
428 | { PCI_VENDOR_ID_TI, 0x803B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, | 429 | { PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_XX12_FM, PCI_ANY_ID, |
429 | 0 }, /* xx12 - should be also supported */ | 430 | PCI_ANY_ID, 0, 0, 0 }, |
431 | { PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_XX20_FM, PCI_ANY_ID, | ||
432 | PCI_ANY_ID, 0, 0, 0 }, | ||
430 | { } | 433 | { } |
431 | }; | 434 | }; |
432 | 435 | ||
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index d37f46aaaea1..ccd706f876ec 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
@@ -735,9 +735,11 @@ | |||
735 | #define PCI_DEVICE_ID_TI_TVP4020 0x3d07 | 735 | #define PCI_DEVICE_ID_TI_TVP4020 0x3d07 |
736 | #define PCI_DEVICE_ID_TI_4450 0x8011 | 736 | #define PCI_DEVICE_ID_TI_4450 0x8011 |
737 | #define PCI_DEVICE_ID_TI_XX21_XX11 0x8031 | 737 | #define PCI_DEVICE_ID_TI_XX21_XX11 0x8031 |
738 | #define PCI_DEVICE_ID_TI_XX21_XX11_FM 0x8033 | ||
738 | #define PCI_DEVICE_ID_TI_XX21_XX11_SD 0x8034 | 739 | #define PCI_DEVICE_ID_TI_XX21_XX11_SD 0x8034 |
739 | #define PCI_DEVICE_ID_TI_X515 0x8036 | 740 | #define PCI_DEVICE_ID_TI_X515 0x8036 |
740 | #define PCI_DEVICE_ID_TI_XX12 0x8039 | 741 | #define PCI_DEVICE_ID_TI_XX12 0x8039 |
742 | #define PCI_DEVICE_ID_TI_XX12_FM 0x803b | ||
741 | #define PCI_DEVICE_ID_TI_1130 0xac12 | 743 | #define PCI_DEVICE_ID_TI_1130 0xac12 |
742 | #define PCI_DEVICE_ID_TI_1031 0xac13 | 744 | #define PCI_DEVICE_ID_TI_1031 0xac13 |
743 | #define PCI_DEVICE_ID_TI_1131 0xac15 | 745 | #define PCI_DEVICE_ID_TI_1131 0xac15 |
@@ -765,6 +767,7 @@ | |||
765 | #define PCI_DEVICE_ID_TI_1510 0xac56 | 767 | #define PCI_DEVICE_ID_TI_1510 0xac56 |
766 | #define PCI_DEVICE_ID_TI_X620 0xac8d | 768 | #define PCI_DEVICE_ID_TI_X620 0xac8d |
767 | #define PCI_DEVICE_ID_TI_X420 0xac8e | 769 | #define PCI_DEVICE_ID_TI_X420 0xac8e |
770 | #define PCI_DEVICE_ID_TI_XX20_FM 0xac8f | ||
768 | 771 | ||
769 | #define PCI_VENDOR_ID_SONY 0x104d | 772 | #define PCI_VENDOR_ID_SONY 0x104d |
770 | 773 | ||