diff options
author | Denis Loginov <dinvlad@gmail.com> | 2009-07-28 02:39:10 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-12 11:18:19 -0400 |
commit | 6baefab531b22288be3b4ddef5671ea6469b09f8 (patch) | |
tree | 8a924308e2be2fd95f8b7b4ac39a14cb1488e476 | |
parent | 8b605f18104c369e838e29a123ed768a7457d3d3 (diff) |
V4L/DVB (12356): gspca - sonixj: Webcam 0c45:6148 added
Signed-off-by: Denis Loginov <dinvlad@gmail.com>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | Documentation/video4linux/gspca.txt | 1 | ||||
-rw-r--r-- | drivers/media/video/gspca/sonixj.c | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt index 37247697dbe8..b43702470130 100644 --- a/Documentation/video4linux/gspca.txt +++ b/Documentation/video4linux/gspca.txt | |||
@@ -287,6 +287,7 @@ sonixj 0c45:613a Microdia Sonix PC Camera | |||
287 | sonixj 0c45:613b Surfer SN-206 | 287 | sonixj 0c45:613b Surfer SN-206 |
288 | sonixj 0c45:613c Sonix Pccam168 | 288 | sonixj 0c45:613c Sonix Pccam168 |
289 | sonixj 0c45:6143 Sonix Pccam168 | 289 | sonixj 0c45:6143 Sonix Pccam168 |
290 | sonixj 0c45:6148 Digitus DA-70811/ZSMC USB PC Camera ZS211/Microdia | ||
290 | sn9c20x 0c45:6240 PC Camera (SN9C201 + MT9M001) | 291 | sn9c20x 0c45:6240 PC Camera (SN9C201 + MT9M001) |
291 | sn9c20x 0c45:6242 PC Camera (SN9C201 + MT9M111) | 292 | sn9c20x 0c45:6242 PC Camera (SN9C201 + MT9M111) |
292 | sn9c20x 0c45:6248 PC Camera (SN9C201 + OV9655) | 293 | sn9c20x 0c45:6248 PC Camera (SN9C201 + OV9655) |
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c index 3f3e1705ce7a..f0b762f770fb 100644 --- a/drivers/media/video/gspca/sonixj.c +++ b/drivers/media/video/gspca/sonixj.c | |||
@@ -2339,7 +2339,8 @@ static const __devinitdata struct usb_device_id device_table[] = { | |||
2339 | {USB_DEVICE(0x0c45, 0x60fe), BSI(SN9C105, OV7630, 0x21)}, | 2339 | {USB_DEVICE(0x0c45, 0x60fe), BSI(SN9C105, OV7630, 0x21)}, |
2340 | #endif | 2340 | #endif |
2341 | {USB_DEVICE(0x0c45, 0x6100), BSI(SN9C120, MI0360, 0x5d)}, /*sn9c128*/ | 2341 | {USB_DEVICE(0x0c45, 0x6100), BSI(SN9C120, MI0360, 0x5d)}, /*sn9c128*/ |
2342 | /* {USB_DEVICE(0x0c45, 0x6108), BSI(SN9C120, OM6801, 0x??)}, */ | 2342 | /* {USB_DEVICE(0x0c45, 0x6102), BSI(SN9C120, PO2030N, ??)}, */ |
2343 | /* {USB_DEVICE(0x0c45, 0x6108), BSI(SN9C120, OM6802, 0x21)}, */ | ||
2343 | {USB_DEVICE(0x0c45, 0x610a), BSI(SN9C120, OV7648, 0x21)}, /*sn9c128*/ | 2344 | {USB_DEVICE(0x0c45, 0x610a), BSI(SN9C120, OV7648, 0x21)}, /*sn9c128*/ |
2344 | {USB_DEVICE(0x0c45, 0x610b), BSI(SN9C120, OV7660, 0x21)}, /*sn9c128*/ | 2345 | {USB_DEVICE(0x0c45, 0x610b), BSI(SN9C120, OV7660, 0x21)}, /*sn9c128*/ |
2345 | {USB_DEVICE(0x0c45, 0x610c), BSI(SN9C120, HV7131R, 0x11)}, /*sn9c128*/ | 2346 | {USB_DEVICE(0x0c45, 0x610c), BSI(SN9C120, HV7131R, 0x11)}, /*sn9c128*/ |
@@ -2355,6 +2356,7 @@ static const __devinitdata struct usb_device_id device_table[] = { | |||
2355 | #if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE | 2356 | #if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE |
2356 | {USB_DEVICE(0x0c45, 0x6130), BSI(SN9C120, MI0360, 0x5d)}, | 2357 | {USB_DEVICE(0x0c45, 0x6130), BSI(SN9C120, MI0360, 0x5d)}, |
2357 | #endif | 2358 | #endif |
2359 | /* {USB_DEVICE(0x0c45, 0x6132), BSI(SN9C120, OV7670, 0x21)}, */ | ||
2358 | {USB_DEVICE(0x0c45, 0x6138), BSI(SN9C120, MO4000, 0x21)}, | 2360 | {USB_DEVICE(0x0c45, 0x6138), BSI(SN9C120, MO4000, 0x21)}, |
2359 | {USB_DEVICE(0x0c45, 0x613a), BSI(SN9C120, OV7648, 0x21)}, | 2361 | {USB_DEVICE(0x0c45, 0x613a), BSI(SN9C120, OV7648, 0x21)}, |
2360 | #if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE | 2362 | #if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE |
@@ -2362,7 +2364,9 @@ static const __devinitdata struct usb_device_id device_table[] = { | |||
2362 | #endif | 2364 | #endif |
2363 | {USB_DEVICE(0x0c45, 0x613c), BSI(SN9C120, HV7131R, 0x11)}, | 2365 | {USB_DEVICE(0x0c45, 0x613c), BSI(SN9C120, HV7131R, 0x11)}, |
2364 | {USB_DEVICE(0x0c45, 0x613e), BSI(SN9C120, OV7630, 0x21)}, | 2366 | {USB_DEVICE(0x0c45, 0x613e), BSI(SN9C120, OV7630, 0x21)}, |
2365 | {USB_DEVICE(0x0c45, 0x6143), BSI(SN9C120, SP80708, 0x18)}, | 2367 | /* {USB_DEVICE(0x0c45, 0x6142), BSI(SN9C120, PO2030N, ??)}, *sn9c120b*/ |
2368 | {USB_DEVICE(0x0c45, 0x6143), BSI(SN9C120, SP80708, 0x18)}, /*sn9c120b*/ | ||
2369 | {USB_DEVICE(0x0c45, 0x6148), BSI(SN9C120, OM6802, 0x21)}, /*sn9c120b*/ | ||
2366 | {} | 2370 | {} |
2367 | }; | 2371 | }; |
2368 | MODULE_DEVICE_TABLE(usb, device_table); | 2372 | MODULE_DEVICE_TABLE(usb, device_table); |