lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Define and use PCI_DEVICE_ID_MARVELL_88ALP01_CCIC for CAFÉ camera driver

Browse Source 
Also, stop looking at the NAND controller (0x4100) and checking the
device class. For a while during development, all three functions on the
chip had the same ID. We made them fix that fairly promptly, and we can
forget about it now.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Acked-by: Jonathan Corbet <corbet@lwn.net>
This commit is contained in:
David Woodhouse
2008-09-03 09:49:20 +01:00
parent 514fca4373
commit aa7a7fb399
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/media/video/cafe_ccic.c
View File

@@ -2091,15 +2091,8 @@ static int cafe_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
int ret; int ret;
u16 classword;
struct cafe_camera *cam; struct cafe_camera *cam;
/*
* Make sure we have a camera here - we'll get calls for
* the other cafe devices as well.
*/
pci_read_config_word(pdev, PCI_CLASS_DEVICE, &classword);
if (classword != PCI_CLASS_MULTIMEDIA_VIDEO)
return -ENODEV;
/* /*
* Start putting together one of our big camera structures. * Start putting together one of our big camera structures.
*/ */
@@ -2287,8 +2280,8 @@ static int cafe_pci_resume(struct pci_dev *pdev)
static struct pci_device_id cafe_ids[] = { static struct pci_device_id cafe_ids[] = {
{ PCI_DEVICE(0x11ab, 0x4100) }, /* Eventual real ID */ { PCI_DEVICE(PCI_VENDOR_ID_MARVELL,
{ PCI_DEVICE(0x11ab, 0x4102) }, /* Really eventual real ID */ PCI_DEVICE_ID_MARVELL_88ALP01_CCIC) },
{ 0, } { 0, }
}; };

1
include/linux/pci_ids.h
View File

@@ -1523,6 +1523,7 @@
#define PCI_DEVICE_ID_MARVELL_MV64460 0x6480 #define PCI_DEVICE_ID_MARVELL_MV64460 0x6480
#define PCI_DEVICE_ID_MARVELL_88ALP01_NAND 0x4100 #define PCI_DEVICE_ID_MARVELL_88ALP01_NAND 0x4100
#define PCI_DEVICE_ID_MARVELL_88ALP01_SD 0x4101 #define PCI_DEVICE_ID_MARVELL_88ALP01_SD 0x4101
#define PCI_DEVICE_ID_MARVELL_88ALP01_CCIC 0x4102
#define PCI_VENDOR_ID_V3 0x11b0 #define PCI_VENDOR_ID_V3 0x11b0
#define PCI_DEVICE_ID_V3_V960 0x0001 #define PCI_DEVICE_ID_V3_V960 0x0001