Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a94a5086 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8869): gspca: Move the Sonix webcams with TAS5110C1B from sn9c102 to gspca. 



This patch makes gspca claim the USB-ID for sn9c101/2 cams with a TAS5110C1B
sensor even if both gspca and sn9c102 are enabled, as these cams are much
better supported under gspca (and extensively tested with gspca).
It also removes an usb-id from sn9c102 for one more unsupported bridge
sensor combo.

Signed-off-by: default avatarHans de Goede <j.w.r.degoede@hhs.nl>
Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 93627736

drivers/media/video/gspca/sonixb.c

+3 −3
Original line number Diff line number Diff line
@@ -1201,10 +1201,10 @@ static const struct sd_desc sd_desc = { 




static __devinitdata struct usb_device_id device_table[] = {

	{USB_DEVICE(0x0c45, 0x6001), SB(TAS5110, 102)}, /* TAS5110C1B */

	{USB_DEVICE(0x0c45, 0x6005), SB(TAS5110, 101)}, /* TAS5110C1B */

#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE

	{USB_DEVICE(0x0c45, 0x6001), SB(TAS5110, 102)},

	{USB_DEVICE(0x0c45, 0x6005), SB(TAS5110, 101)},

	{USB_DEVICE(0x0c45, 0x6007), SB(TAS5110, 101)},

	{USB_DEVICE(0x0c45, 0x6007), SB(TAS5110, 101)}, /* TAS5110D */

	{USB_DEVICE(0x0c45, 0x6009), SB(PAS106, 101)},

	{USB_DEVICE(0x0c45, 0x600d), SB(PAS106, 101)},

#endif

drivers/media/video/sn9c102/sn9c102_devtable.h

+3 −1
Original line number Diff line number Diff line
@@ -40,8 +40,10 @@ struct sn9c102_device; 


static const struct usb_device_id sn9c102_id_table[] = {

	/* SN9C101 and SN9C102 */

#if !defined CONFIG_USB_GSPCA && !defined CONFIG_USB_GSPCA_MODULE

	{ SN9C102_USB_DEVICE(0x0c45, 0x6001, BRIDGE_SN9C102), },

	{ SN9C102_USB_DEVICE(0x0c45, 0x6005, BRIDGE_SN9C102), },

#endif

	{ SN9C102_USB_DEVICE(0x0c45, 0x6007, BRIDGE_SN9C102), },

	{ SN9C102_USB_DEVICE(0x0c45, 0x6009, BRIDGE_SN9C102), },

	{ SN9C102_USB_DEVICE(0x0c45, 0x600d, BRIDGE_SN9C102), },
@@ -72,7 +74,7 @@ static const struct usb_device_id sn9c102_id_table[] = { 
	{ SN9C102_USB_DEVICE(0x0c45, 0x60a3, BRIDGE_SN9C103), },

/*	{ SN9C102_USB_DEVICE(0x0c45, 0x60a8, BRIDGE_SN9C103), }, PAS106 */

/*	{ SN9C102_USB_DEVICE(0x0c45, 0x60aa, BRIDGE_SN9C103), }, TAS5130 */

	{ SN9C102_USB_DEVICE(0x0c45, 0x60ab, BRIDGE_SN9C103), },

/*	{ SN9C102_USB_DEVICE(0x0c45, 0x60ab, BRIDGE_SN9C103), }, TAS5130 */

	{ SN9C102_USB_DEVICE(0x0c45, 0x60ac, BRIDGE_SN9C103), },

	{ SN9C102_USB_DEVICE(0x0c45, 0x60ae, BRIDGE_SN9C103), },

	{ SN9C102_USB_DEVICE(0x0c45, 0x60af, BRIDGE_SN9C103), },