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

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

V4L/DVB (8874): gspca: Adjust hstart for sn9c103/ov7630 and update usb-id's. 



- Adjust hstart in ov7630 on sn9c103 initdata to shift bayer pattern, this is
 the same change as done for the other initdata tables in a previous patch.
- Assign usb-id's for the ov7630 + sn9c103 to gspca if gspca and sn9c102
  drivers are both enabled.

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 0fc23d20

drivers/media/video/gspca/sonixb.c

+4 −2
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static const __u8 initOv7630[] = { 
static const __u8 initOv7630_3[] = {

	0x44, 0x44, 0x00, 0x1a, 0x20, 0x20, 0x20, 0x80,	/* r01 .. r08 */

	0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,	/* r09 .. r10 */

	0x00, 0x01, 0x01, 0x0a,				/* r11 .. r14 */

	0x00, 0x02, 0x01, 0x0a,				/* r11 .. r14 */

	0x28, 0x1e,			/* H & V sizes     r15 .. r16 */

	0x68, 0x8f, MCK_INIT1,				/* r17 .. r19 */

	0x1d, 0x10, 0x02, 0x03, 0x0f, 0x0c, 0x00,	/* r1a .. r20 */
@@ -1230,10 +1230,12 @@ static __devinitdata struct usb_device_id device_table[] = { 
	{USB_DEVICE(0x0c45, 0x602d), SB(HV7131R, 102)},

#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE

	{USB_DEVICE(0x0c45, 0x602e), SB(OV7630, 102)},

#endif

	{USB_DEVICE(0x0c45, 0x608f), SB(OV7630, 103)},

#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE

	{USB_DEVICE(0x0c45, 0x60af), SB(PAS202, 103)},

	{USB_DEVICE(0x0c45, 0x60b0), SB(OV7630, 103)},

#endif

	{USB_DEVICE(0x0c45, 0x60b0), SB(OV7630, 103)},

	{}

};

MODULE_DEVICE_TABLE(usb, device_table);

drivers/media/video/sn9c102/sn9c102_devtable.h

+4 −0
Original line number Diff line number Diff line
@@ -68,7 +68,9 @@ static const struct usb_device_id sn9c102_id_table[] = { 
	{ SN9C102_USB_DEVICE(0x0c45, 0x608b, BRIDGE_SN9C103), },

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

/*	{ SN9C102_USB_DEVICE(0x0c45, 0x608e, BRIDGE_SN9C103), }, CISVF10 */

#if !defined CONFIG_USB_GSPCA && !defined CONFIG_USB_GSPCA_MODULE

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

#endif

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

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

	{ SN9C102_USB_DEVICE(0x0c45, 0x60a3, BRIDGE_SN9C103), },
@@ -78,7 +80,9 @@ static const struct usb_device_id sn9c102_id_table[] = { 
	{ SN9C102_USB_DEVICE(0x0c45, 0x60ac, BRIDGE_SN9C103), },

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

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

#if !defined CONFIG_USB_GSPCA && !defined CONFIG_USB_GSPCA_MODULE

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

#endif

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

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

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