diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-10-01 22:56:32 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2006-10-01 22:56:32 +0200 |
| commit | 9a911497132a384b61c15b4e58b9a4f71eda4470 (patch) | |
| tree | 074e5abe16f6bd72e65f318b59bc3716bc969199 /linux/drivers/media/video | |
| parent | 266ccc9e4db8dd7e6dd0b631decb7f1b52f27eb2 (diff) | |
| download | mediapointer-dvb-s2-9a911497132a384b61c15b4e58b9a4f71eda4470.tar.gz mediapointer-dvb-s2-9a911497132a384b61c15b4e58b9a4f71eda4470.tar.bz2 | |
Fix msp343xG handling (regression from 2.6.16)
From: Hans Verkuil <hverkuil@xs4all.nl>
The msp3430G and msp3435G models cannot do Automatic Standard Detection.
So these should be forced to BTSC. These chips are early production versions
for the msp34xxG series and are quite rare.
The workaround for kernel 2.6.18 is to use 'standard=32' as msp3400
module option. Due to broken handling of the 'standard' option in 2.6.17 there is
no workaround possible for that kernel.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/msp3400-driver.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/msp3400-driver.h | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/msp3400-kthreads.c | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c index 4e8831f88..1105e4257 100644 --- a/linux/drivers/media/video/msp3400-driver.c +++ b/linux/drivers/media/video/msp3400-driver.c @@ -977,6 +977,8 @@ static int msp_attach(struct i2c_adapter *adapter, int address, int kind) state->has_virtual_dolby_surround = msp_revision == 'G' && msp_prod_lo == 1; /* Has Virtual Dolby Surround & Dolby Pro Logic: only in msp34x2 */ state->has_dolby_pro_logic = msp_revision == 'G' && msp_prod_lo == 2; + /* The msp343xG supports BTSC only and cannot do Automatic Standard Detection. */ + state->force_btsc = msp_family == 3 && msp_revision == 'G' && msp_prod_hi == 3; state->opmode = opmode; if (state->opmode == OPMODE_AUTO) { diff --git a/linux/drivers/media/video/msp3400-driver.h b/linux/drivers/media/video/msp3400-driver.h index 33eac394d..a783277ab 100644 --- a/linux/drivers/media/video/msp3400-driver.h +++ b/linux/drivers/media/video/msp3400-driver.h @@ -64,6 +64,7 @@ struct msp_state { u8 has_sound_processing; u8 has_virtual_dolby_surround; u8 has_dolby_pro_logic; + u8 force_btsc; int radio; int opmode; diff --git a/linux/drivers/media/video/msp3400-kthreads.c b/linux/drivers/media/video/msp3400-kthreads.c index 78dd43490..053ebec73 100644 --- a/linux/drivers/media/video/msp3400-kthreads.c +++ b/linux/drivers/media/video/msp3400-kthreads.c @@ -999,9 +999,9 @@ int msp34xxg_thread(void *data) /* setup the chip*/ msp34xxg_reset(client); - state->std = state->radio ? 0x40 : msp_standard; + state->std = state->radio ? 0x40 : + (state->force_btsc && msp_standard == 1) ? 32 : msp_standard; /* start autodetect */ - msp_write_dem(client, 0x20, state->std); if (state->std != 1) goto unmute; |