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

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

[media] gspca_sonixj: Enable more usb ids when sn9c102 gets compiled too 



Both we and the windows driver make no sensor specific differences
(with some exceptions) for different sonixj bridge types. Thus if a
sn9c105 bridge has been successfully tested with a sensor, the same
sensor can be successfully used with a sn9c120 bridge too.

Using this knowledge we can move over most usb-ids too the sonixj
driver when both are compiled.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 69ffd254

drivers/media/video/gspca/sonixj.c

+1 −5
Original line number Diff line number Diff line
@@ -2908,10 +2908,8 @@ static const struct sd_desc sd_desc = { 
			| (SENSOR_ ## sensor << 8) \

			| (flags)

static const __devinitdata struct usb_device_id device_table[] = {

#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE

	{USB_DEVICE(0x0458, 0x7025), BS(SN9C120, MI0360)},

	{USB_DEVICE(0x0458, 0x702e), BS(SN9C120, OV7660)},

#endif

	{USB_DEVICE(0x045e, 0x00f5), BSF(SN9C105, OV7660, PDN_INV)},

	{USB_DEVICE(0x045e, 0x00f7), BSF(SN9C105, OV7660, PDN_INV)},

	{USB_DEVICE(0x0471, 0x0327), BS(SN9C105, MI0360)},
@@ -2936,8 +2934,8 @@ static const __devinitdata struct usb_device_id device_table[] = { 
/*	{USB_DEVICE(0x0c45, 0x60fa), BS(SN9C105, OV7648)}, */

/*	{USB_DEVICE(0x0c45, 0x60f2), BS(SN9C105, OV7660)}, */

	{USB_DEVICE(0x0c45, 0x60fb), BS(SN9C105, OV7660)},

#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE

	{USB_DEVICE(0x0c45, 0x60fc), BS(SN9C105, HV7131R)},

#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE

	{USB_DEVICE(0x0c45, 0x60fe), BS(SN9C105, OV7630)},

#endif

	{USB_DEVICE(0x0c45, 0x6100), BS(SN9C120, MI0360)},	/*sn9c128*/
@@ -2962,9 +2960,7 @@ static const __devinitdata struct usb_device_id device_table[] = { 
/*	{USB_DEVICE(0x0c45, 0x6132), BS(SN9C120, OV7670)}, */

	{USB_DEVICE(0x0c45, 0x6138), BS(SN9C120, MO4000)},

	{USB_DEVICE(0x0c45, 0x613a), BS(SN9C120, OV7648)},

#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE

	{USB_DEVICE(0x0c45, 0x613b), BS(SN9C120, OV7660)},

#endif

	{USB_DEVICE(0x0c45, 0x613c), BS(SN9C120, HV7131R)},

	{USB_DEVICE(0x0c45, 0x613e), BS(SN9C120, OV7630)},

	{USB_DEVICE(0x0c45, 0x6142), BS(SN9C120, PO2030N)},	/*sn9c120b*/

drivers/media/video/sn9c102/sn9c102_devtable.h

+2 −4
Original line number Diff line number Diff line
@@ -107,21 +107,19 @@ static const struct usb_device_id sn9c102_id_table[] = { 
/*	{ SN9C102_USB_DEVICE(0x0c45, 0x60ef, BRIDGE_SN9C105), }, ICM105C */

/*	{ SN9C102_USB_DEVICE(0x0c45, 0x60fa, BRIDGE_SN9C105), }, OV7648 */

	{ SN9C102_USB_DEVICE(0x0c45, 0x60fb, BRIDGE_SN9C105), },

#endif

	{ SN9C102_USB_DEVICE(0x0c45, 0x60fc, BRIDGE_SN9C105), },

#endif

	{ SN9C102_USB_DEVICE(0x0c45, 0x60fe, BRIDGE_SN9C105), },

	/* SN9C120 */

#if !defined CONFIG_USB_GSPCA_SONIXJ && !defined CONFIG_USB_GSPCA_SONIXJ_MODULE

	{ SN9C102_USB_DEVICE(0x0458, 0x7025, BRIDGE_SN9C120), },

/*	{ SN9C102_USB_DEVICE(0x0c45, 0x6102, BRIDGE_SN9C120), }, po2030 */

/*	{ SN9C102_USB_DEVICE(0x0c45, 0x6108, BRIDGE_SN9C120), }, om6801 */

/*	{ SN9C102_USB_DEVICE(0x0c45, 0x610f, BRIDGE_SN9C120), }, S5K53BEB */

#if !defined CONFIG_USB_GSPCA_SONIXJ && !defined CONFIG_USB_GSPCA_SONIXJ_MODULE

	{ SN9C102_USB_DEVICE(0x0c45, 0x6130, BRIDGE_SN9C120), },

/*	{ SN9C102_USB_DEVICE(0x0c45, 0x6138, BRIDGE_SN9C120), }, MO8000 */

	{ SN9C102_USB_DEVICE(0x0c45, 0x613a, BRIDGE_SN9C120), },

#endif

	{ SN9C102_USB_DEVICE(0x0c45, 0x613b, BRIDGE_SN9C120), },

#if !defined CONFIG_USB_GSPCA_SONIXJ && !defined CONFIG_USB_GSPCA_SONIXJ_MODULE

	{ SN9C102_USB_DEVICE(0x0c45, 0x613c, BRIDGE_SN9C120), },

	{ SN9C102_USB_DEVICE(0x0c45, 0x613e, BRIDGE_SN9C120), },

#endif