openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] gspca - sonixj: Simplify GPIO setting when audio present 

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Jean-François Moine 2011-02-10 07:52:58 -03:00 committed by Mauro Carvalho Chehab
parent 222036765c
commit e6a92a7445
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/video/gspca/sonixj.c
View File

@ -1789,7 +1789,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
{ {
struct sd *sd = (struct sd *) gspca_dev; struct sd *sd = (struct sd *) gspca_dev;
const u8 *sn9c1xx; const u8 *sn9c1xx;
u8 regGpio[] = { 0x29, 0x74 }; /* with audio */ u8 regGpio[] = { 0x29, 0x70 }; /* no audio */
u8 regF1; u8 regF1;
/* setup a selector by bridge */ /* setup a selector by bridge */
@ -1801,6 +1801,8 @@ static int sd_init(struct gspca_dev *gspca_dev)
if (gspca_dev->usb_err < 0) if (gspca_dev->usb_err < 0)
return gspca_dev->usb_err; return gspca_dev->usb_err;
PDEBUG(D_PROBE, "Sonix chip id: %02x", regF1); PDEBUG(D_PROBE, "Sonix chip id: %02x", regF1);
if (gspca_dev->audio)
regGpio[1] |= 0x04; /* with audio */
switch (sd->bridge) { switch (sd->bridge) {
case BRIDGE_SN9C102P: case BRIDGE_SN9C102P:
case BRIDGE_SN9C105: case BRIDGE_SN9C105:
@ -1840,7 +1842,6 @@ static int sd_init(struct gspca_dev *gspca_dev)
reg_w1(gspca_dev, 0x02, 0x62); reg_w1(gspca_dev, 0x02, 0x62);
break; break;
case BRIDGE_SN9C120: case BRIDGE_SN9C120:
regGpio[1] = 0x70; /* no audio */
reg_w(gspca_dev, 0x01, regGpio, 2); reg_w(gspca_dev, 0x01, regGpio, 2);
break; break;
} }