[media] tw68: Move PCI vendor and device IDs to pci_ids.h
This commits moves the Intersil/Techwell PCI vendor ID, and the device IDs for the TW68 PCI video capture cards. This will allow to support future Intersil/Techwell devices without duplicating the IDs. Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Родитель
823ea2a639
Коммит
ab149b88eb
|
@ -37,6 +37,7 @@
|
|||
#include <linux/delay.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/pci_ids.h>
|
||||
#include <linux/pm.h>
|
||||
|
||||
#include <media/v4l2-dev.h>
|
||||
|
@ -70,13 +71,13 @@ static atomic_t tw68_instance = ATOMIC_INIT(0);
|
|||
* added under vendor 0x1797 (Techwell Inc.) as subsystem IDs.
|
||||
*/
|
||||
static const struct pci_device_id tw68_pci_tbl[] = {
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_TECHWELL, PCI_DEVICE_ID_6800)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_TECHWELL, PCI_DEVICE_ID_6801)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_TECHWELL, PCI_DEVICE_ID_6804)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_TECHWELL, PCI_DEVICE_ID_6816_1)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_TECHWELL, PCI_DEVICE_ID_6816_2)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_TECHWELL, PCI_DEVICE_ID_6816_3)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_TECHWELL, PCI_DEVICE_ID_6816_4)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_TECHWELL, PCI_DEVICE_ID_TECHWELL_6800)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_TECHWELL, PCI_DEVICE_ID_TECHWELL_6801)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_TECHWELL, PCI_DEVICE_ID_TECHWELL_6804)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_TECHWELL, PCI_DEVICE_ID_TECHWELL_6816_1)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_TECHWELL, PCI_DEVICE_ID_TECHWELL_6816_2)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_TECHWELL, PCI_DEVICE_ID_TECHWELL_6816_3)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_TECHWELL, PCI_DEVICE_ID_TECHWELL_6816_4)},
|
||||
{0,}
|
||||
};
|
||||
|
||||
|
@ -263,15 +264,15 @@ static int tw68_initdev(struct pci_dev *pci_dev,
|
|||
}
|
||||
|
||||
switch (pci_id->device) {
|
||||
case PCI_DEVICE_ID_6800: /* TW6800 */
|
||||
case PCI_DEVICE_ID_TECHWELL_6800: /* TW6800 */
|
||||
dev->vdecoder = TW6800;
|
||||
dev->board_virqmask = TW68_VID_INTS;
|
||||
break;
|
||||
case PCI_DEVICE_ID_6801: /* Video decoder for TW6802 */
|
||||
case PCI_DEVICE_ID_TECHWELL_6801: /* Video decoder for TW6802 */
|
||||
dev->vdecoder = TW6801;
|
||||
dev->board_virqmask = TW68_VID_INTS | TW68_VID_INTSX;
|
||||
break;
|
||||
case PCI_DEVICE_ID_6804: /* Video decoder for TW6804 */
|
||||
case PCI_DEVICE_ID_TECHWELL_6804: /* Video decoder for TW6804 */
|
||||
dev->vdecoder = TW6804;
|
||||
dev->board_virqmask = TW68_VID_INTS | TW68_VID_INTSX;
|
||||
break;
|
||||
|
|
|
@ -42,22 +42,6 @@
|
|||
|
||||
#define UNSET (-1U)
|
||||
|
||||
/* system vendor and device ID's */
|
||||
#define PCI_VENDOR_ID_TECHWELL 0x1797
|
||||
#define PCI_DEVICE_ID_6800 0x6800
|
||||
#define PCI_DEVICE_ID_6801 0x6801
|
||||
#define PCI_DEVICE_ID_AUDIO2 0x6802
|
||||
#define PCI_DEVICE_ID_TS3 0x6803
|
||||
#define PCI_DEVICE_ID_6804 0x6804
|
||||
#define PCI_DEVICE_ID_AUDIO5 0x6805
|
||||
#define PCI_DEVICE_ID_TS6 0x6806
|
||||
|
||||
/* tw6816 based cards */
|
||||
#define PCI_DEVICE_ID_6816_1 0x6810
|
||||
#define PCI_DEVICE_ID_6816_2 0x6811
|
||||
#define PCI_DEVICE_ID_6816_3 0x6812
|
||||
#define PCI_DEVICE_ID_6816_4 0x6813
|
||||
|
||||
#define TW68_NORMS ( \
|
||||
V4L2_STD_NTSC | V4L2_STD_PAL | V4L2_STD_SECAM | \
|
||||
V4L2_STD_PAL_M | V4L2_STD_PAL_Nc | V4L2_STD_PAL_60)
|
||||
|
|
|
@ -2332,6 +2332,15 @@
|
|||
|
||||
#define PCI_VENDOR_ID_CAVIUM 0x177d
|
||||
|
||||
#define PCI_VENDOR_ID_TECHWELL 0x1797
|
||||
#define PCI_DEVICE_ID_TECHWELL_6800 0x6800
|
||||
#define PCI_DEVICE_ID_TECHWELL_6801 0x6801
|
||||
#define PCI_DEVICE_ID_TECHWELL_6804 0x6804
|
||||
#define PCI_DEVICE_ID_TECHWELL_6816_1 0x6810
|
||||
#define PCI_DEVICE_ID_TECHWELL_6816_2 0x6811
|
||||
#define PCI_DEVICE_ID_TECHWELL_6816_3 0x6812
|
||||
#define PCI_DEVICE_ID_TECHWELL_6816_4 0x6813
|
||||
|
||||
#define PCI_VENDOR_ID_BELKIN 0x1799
|
||||
#define PCI_DEVICE_ID_BELKIN_F5D7010V7 0x701f
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче