V4L/DVB: gspca_sonixb: Make sonixb driver handle pas106 and pas202 cameras
Make the sonixb driver handle pas106 and pas202 cameras, when both it and the sn9c102 driver are enabled in the kernel configuration. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
421763e776
commit
0e4b91c306
|
@ -1440,17 +1440,17 @@ static const struct usb_device_id device_table[] __devinitconst = {
|
||||||
{USB_DEVICE(0x0c45, 0x6005), SB(TAS5110C, 101)}, /* TAS5110C1B */
|
{USB_DEVICE(0x0c45, 0x6005), SB(TAS5110C, 101)}, /* TAS5110C1B */
|
||||||
#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
|
#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
|
||||||
{USB_DEVICE(0x0c45, 0x6007), SB(TAS5110D, 101)}, /* TAS5110D */
|
{USB_DEVICE(0x0c45, 0x6007), SB(TAS5110D, 101)}, /* TAS5110D */
|
||||||
|
#endif
|
||||||
{USB_DEVICE(0x0c45, 0x6009), SB(PAS106, 101)},
|
{USB_DEVICE(0x0c45, 0x6009), SB(PAS106, 101)},
|
||||||
{USB_DEVICE(0x0c45, 0x600d), SB(PAS106, 101)},
|
{USB_DEVICE(0x0c45, 0x600d), SB(PAS106, 101)},
|
||||||
#endif
|
|
||||||
{USB_DEVICE(0x0c45, 0x6011), SB(OV6650, 101)},
|
{USB_DEVICE(0x0c45, 0x6011), SB(OV6650, 101)},
|
||||||
#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
|
#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
|
||||||
{USB_DEVICE(0x0c45, 0x6019), SB(OV7630, 101)},
|
{USB_DEVICE(0x0c45, 0x6019), SB(OV7630, 101)},
|
||||||
{USB_DEVICE(0x0c45, 0x6024), SB(TAS5130CXX, 102)},
|
{USB_DEVICE(0x0c45, 0x6024), SB(TAS5130CXX, 102)},
|
||||||
{USB_DEVICE(0x0c45, 0x6025), SB(TAS5130CXX, 102)},
|
{USB_DEVICE(0x0c45, 0x6025), SB(TAS5130CXX, 102)},
|
||||||
|
#endif
|
||||||
{USB_DEVICE(0x0c45, 0x6028), SB(PAS202, 102)},
|
{USB_DEVICE(0x0c45, 0x6028), SB(PAS202, 102)},
|
||||||
{USB_DEVICE(0x0c45, 0x6029), SB(PAS106, 102)},
|
{USB_DEVICE(0x0c45, 0x6029), SB(PAS106, 102)},
|
||||||
#endif
|
|
||||||
{USB_DEVICE(0x0c45, 0x602c), SB(OV7630, 102)},
|
{USB_DEVICE(0x0c45, 0x602c), SB(OV7630, 102)},
|
||||||
{USB_DEVICE(0x0c45, 0x602d), SB(HV7131R, 102)},
|
{USB_DEVICE(0x0c45, 0x602d), SB(HV7131R, 102)},
|
||||||
#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
|
#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE
|
||||||
|
|
|
@ -43,22 +43,26 @@ static const struct usb_device_id sn9c102_id_table[] = {
|
||||||
#if !defined CONFIG_USB_GSPCA && !defined CONFIG_USB_GSPCA_MODULE
|
#if !defined CONFIG_USB_GSPCA && !defined CONFIG_USB_GSPCA_MODULE
|
||||||
{ SN9C102_USB_DEVICE(0x0c45, 0x6001, BRIDGE_SN9C102), },
|
{ SN9C102_USB_DEVICE(0x0c45, 0x6001, BRIDGE_SN9C102), },
|
||||||
{ SN9C102_USB_DEVICE(0x0c45, 0x6005, BRIDGE_SN9C102), },
|
{ SN9C102_USB_DEVICE(0x0c45, 0x6005, BRIDGE_SN9C102), },
|
||||||
{ SN9C102_USB_DEVICE(0x0c45, 0x6007, BRIDGE_SN9C102), },
|
|
||||||
#endif
|
#endif
|
||||||
|
{ SN9C102_USB_DEVICE(0x0c45, 0x6007, BRIDGE_SN9C102), },
|
||||||
|
#if !defined CONFIG_USB_GSPCA && !defined CONFIG_USB_GSPCA_MODULE
|
||||||
{ SN9C102_USB_DEVICE(0x0c45, 0x6009, BRIDGE_SN9C102), },
|
{ SN9C102_USB_DEVICE(0x0c45, 0x6009, BRIDGE_SN9C102), },
|
||||||
{ SN9C102_USB_DEVICE(0x0c45, 0x600d, BRIDGE_SN9C102), },
|
{ SN9C102_USB_DEVICE(0x0c45, 0x600d, BRIDGE_SN9C102), },
|
||||||
/* { SN9C102_USB_DEVICE(0x0c45, 0x6011, BRIDGE_SN9C102), }, OV6650 */
|
/* { SN9C102_USB_DEVICE(0x0c45, 0x6011, BRIDGE_SN9C102), }, OV6650 */
|
||||||
|
#endif
|
||||||
{ SN9C102_USB_DEVICE(0x0c45, 0x6019, BRIDGE_SN9C102), },
|
{ SN9C102_USB_DEVICE(0x0c45, 0x6019, BRIDGE_SN9C102), },
|
||||||
{ SN9C102_USB_DEVICE(0x0c45, 0x6024, BRIDGE_SN9C102), },
|
{ SN9C102_USB_DEVICE(0x0c45, 0x6024, BRIDGE_SN9C102), },
|
||||||
{ SN9C102_USB_DEVICE(0x0c45, 0x6025, BRIDGE_SN9C102), },
|
{ SN9C102_USB_DEVICE(0x0c45, 0x6025, BRIDGE_SN9C102), },
|
||||||
|
#if !defined CONFIG_USB_GSPCA && !defined CONFIG_USB_GSPCA_MODULE
|
||||||
{ SN9C102_USB_DEVICE(0x0c45, 0x6028, BRIDGE_SN9C102), },
|
{ SN9C102_USB_DEVICE(0x0c45, 0x6028, BRIDGE_SN9C102), },
|
||||||
{ SN9C102_USB_DEVICE(0x0c45, 0x6029, BRIDGE_SN9C102), },
|
{ SN9C102_USB_DEVICE(0x0c45, 0x6029, BRIDGE_SN9C102), },
|
||||||
|
#endif
|
||||||
{ SN9C102_USB_DEVICE(0x0c45, 0x602a, BRIDGE_SN9C102), },
|
{ SN9C102_USB_DEVICE(0x0c45, 0x602a, BRIDGE_SN9C102), },
|
||||||
{ SN9C102_USB_DEVICE(0x0c45, 0x602b, BRIDGE_SN9C102), },
|
{ SN9C102_USB_DEVICE(0x0c45, 0x602b, BRIDGE_SN9C102), },
|
||||||
#if !defined CONFIG_USB_GSPCA && !defined CONFIG_USB_GSPCA_MODULE
|
#if !defined CONFIG_USB_GSPCA && !defined CONFIG_USB_GSPCA_MODULE
|
||||||
{ SN9C102_USB_DEVICE(0x0c45, 0x602c, BRIDGE_SN9C102), },
|
{ SN9C102_USB_DEVICE(0x0c45, 0x602c, BRIDGE_SN9C102), },
|
||||||
#endif
|
|
||||||
/* { SN9C102_USB_DEVICE(0x0c45, 0x602d, BRIDGE_SN9C102), }, HV7131R */
|
/* { SN9C102_USB_DEVICE(0x0c45, 0x602d, BRIDGE_SN9C102), }, HV7131R */
|
||||||
|
#endif
|
||||||
{ SN9C102_USB_DEVICE(0x0c45, 0x602e, BRIDGE_SN9C102), },
|
{ SN9C102_USB_DEVICE(0x0c45, 0x602e, BRIDGE_SN9C102), },
|
||||||
{ SN9C102_USB_DEVICE(0x0c45, 0x6030, BRIDGE_SN9C102), },
|
{ SN9C102_USB_DEVICE(0x0c45, 0x6030, BRIDGE_SN9C102), },
|
||||||
/* SN9C103 */
|
/* SN9C103 */
|
||||||
|
|
Loading…
Reference in a new issue