Fix msp343xG handling regression
PATCH 1/6 Fix msp343xG handling regression
Quoted 1 line
From
245d85378610cf62524765da37f64ca3d40ccc6eMon Sep 17 00:00:00 2001
From: Hans Verkuil <[email protected]>
Date: Mon, 2 Oct 2006 23:03:29 -0400
Subject: [PATCH] Fix msp343xG handling regression
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.
Signed-off-by Hans Verkuil <[email protected]>
Signed-off-by Michael Krufky <[email protected]>
--- drivers/media/video/msp3400-driver.c | 2 ++ drivers/media/video/msp3400-driver.h | 1 + drivers/media/video/msp3400-kthreads.c | 5 +++-- 3 files changed, 6 insertions(+), 2 deletions(-)
drivers/media/video/msp3400-driver.c +2 -0
@@ -904,6 +904,8 @@ static int msp_attach(struct i2c_adapter 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 ) {
drivers/media/video/msp3400-driver.h +1 -0
@@ -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;
drivers/media/video/msp3400-kthreads.c +3 -2
@@ -960,9 +960,10 @@ int msp34xxg_thread(void *data)/* setup the chip*/ msp34xxg_reset (client); - state->std = state->radio ?0x40 : msp_standard; -/* start autodetect */ + state->std = state->radio ?0x40 : + (state->force_btsc && msp_standard ==1 ) ?32 : msp_standard;msp_write_dem (client,0x20 , state->std); +/* start autodetect */ if (state->std !=1 ) goto unmute;