diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-13 13:47:07 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-13 13:47:07 -0200 |
| commit | 2bf10f4704af48d1f3b0d403ef9dc13114a8afca (patch) | |
| tree | 643f7a6fb91db7a437b071b9217c1f0ea6bbfd06 /linux/drivers/media/video | |
| parent | e5a282b9882a1c796aa5c92ddf787b78987397e1 (diff) | |
| parent | 1c4d36315614a51e0f369e13c21cb9ed30773bf2 (diff) | |
| download | mediapointer-dvb-s2-2bf10f4704af48d1f3b0d403ef9dc13114a8afca.tar.gz mediapointer-dvb-s2-2bf10f4704af48d1f3b0d403ef9dc13114a8afca.tar.bz2 | |
merge: http://linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/cx25840/cx25840-vbi.c | 9 | ||||
| -rw-r--r-- | linux/drivers/media/video/tuner-core.c | 4 |
2 files changed, 12 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-vbi.c b/linux/drivers/media/video/cx25840/cx25840-vbi.c index f78f8cd2d..876adbcba 100644 --- a/linux/drivers/media/video/cx25840/cx25840-vbi.c +++ b/linux/drivers/media/video/cx25840/cx25840-vbi.c @@ -129,7 +129,14 @@ void cx25840_vbi_setup(struct i2c_client *client) uv_lpf=1; src_decimation=0x21f; - if (std == V4L2_STD_PAL_M) { + if (std == V4L2_STD_PAL_60) { + vblank=26; + vblank656=26; + burst=0x5b; + luma_lpf=2; + comb=0x20; + sc=0x0a8263; + } else if (std == V4L2_STD_PAL_M) { vblank=20; vblank656=24; burst=0x61; diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c index b1db6bf50..a42204b02 100644 --- a/linux/drivers/media/video/tuner-core.c +++ b/linux/drivers/media/video/tuner-core.c @@ -308,6 +308,10 @@ static int tuner_fixup_std(struct tuner *t) { if ((t->std & V4L2_STD_PAL) == V4L2_STD_PAL) { switch (pal[0]) { + case '6': + tuner_dbg ("insmod fixup: PAL => PAL-60\n"); + t->std = V4L2_STD_PAL_60; + break; case 'b': case 'B': case 'g': |