Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 37433
b: refs/heads/master
c: d7304de
h: refs/heads/master
i:
  37431: 0fb0514
v: v3
  • Loading branch information
Trent Piepho authored and Mauro Carvalho Chehab committed Sep 26, 2006
1 parent dc400ec commit a641a08
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 62a7b3e2ada3a76f1a6887b537c07517e90f72dd
refs/heads/master: d7304dee3b7e29e801ba59bbf9a47440c196263d
2 changes: 2 additions & 0 deletions trunk/drivers/media/video/tda9887.c
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,8 @@ static int tda9887_set_config(struct tuner *t, char *buf)
}
if ((t->tda9887_config & TDA9887_INTERCARRIER_NTSC) && (t->std & V4L2_STD_NTSC))
buf[1] &= ~cQSS;
if (t->tda9887_config & TDA9887_GATING_18)
buf[3] &= ~cGating_36;
return 0;
}

Expand Down
2 changes: 2 additions & 0 deletions trunk/drivers/media/video/tuner-simple.c
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,8 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
else if (params->default_top_high)
config |= TDA9887_TOP(params->default_top_high);
}
if (params->default_pll_gating_18)
config |= TDA9887_GATING_18;
i2c_clients_command(c->adapter, TDA9887_SET_CONFIG, &config);
}
tuner_dbg("tv 0x%02x 0x%02x 0x%02x 0x%02x\n",
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/media/video/tuner-types.c
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,7 @@ static struct tuner_params tuner_microtune_4049_fm5_params[] = {
.count = ARRAY_SIZE(tuner_temic_4009f_5_pal_ranges),
.has_tda9887 = 1,
.port1_invert_for_secam_lc = 1,
.default_pll_gating_18 = 1,
},
};

Expand Down
3 changes: 3 additions & 0 deletions trunk/include/media/tuner-types.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ struct tuner_params {
unsigned int port2_invert_for_secam_lc:1;
/* Some cards require PORT1 to be 1 for mono Radio FM and 0 for stereo. */
unsigned int port1_set_for_fm_mono:1;
/* Select 18% (or according to datasheet 0%) L standard PLL gating,
vs the driver default of 36%. */
unsigned int default_pll_gating_18:1;
/* Default tda9887 TOP value in dB for the low band. Default is 0.
Range: -16:+15 */
signed int default_top_low:5;
Expand Down
1 change: 1 addition & 0 deletions trunk/include/media/tuner.h
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ extern int tuner_debug;
#define TDA9887_DEEMPHASIS_50 (2<<16)
#define TDA9887_DEEMPHASIS_75 (3<<16)
#define TDA9887_AUTOMUTE (1<<18)
#define TDA9887_GATING_18 (1<<19)

#ifdef __KERNEL__

Expand Down

0 comments on commit a641a08

Please sign in to comment.