[media] au8522: Handle differences in comb filter config for s-video input

Tweak the comb filter config when in s-video mode to match the Hauppauge
Windows driver values (based on register dumps).

This work was sponsored by GetWellNetwork Inc.

Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 14 insertions, 4 deletions

diff --git a/drivers/media/dvb/frontends/au8522_decoder.c b/drivers/media/dvb/frontends/au8522_decoder.c
index 5ec86970640..b537891a4cc 100644
--- a/drivers/media/dvb/frontends/au8522_decoder.c
+++ b/drivers/media/dvb/frontends/au8522_decoder.c
@@ -278,10 +278,18 @@ static void setup_decoder_defaults(struct au8522_state *state, u8 input_mode)
                         AU8522_TVDEC_COMB_HDIF_THR2_REG06AH_CVBS);
         au8522_writereg(state, AU8522_TVDEC_COMB_HDIF_THR3_REG06BH,
                         AU8522_TVDEC_COMB_HDIF_THR3_REG06BH_CVBS);
-        au8522_writereg(state, AU8522_TVDEC_COMB_DCDIF_THR1_REG06CH,
-                        AU8522_TVDEC_COMB_DCDIF_THR1_REG06CH_CVBS);
-        au8522_writereg(state, AU8522_TVDEC_COMB_DCDIF_THR2_REG06DH,
-                        AU8522_TVDEC_COMB_DCDIF_THR2_REG06DH_CVBS);
+        if (input_mode == AU8522_INPUT_CONTROL_REG081H_SVIDEO_CH13 ||
+            input_mode == AU8522_INPUT_CONTROL_REG081H_SVIDEO_CH24) {
+                au8522_writereg(state, AU8522_TVDEC_COMB_DCDIF_THR1_REG06CH,
+                                AU8522_TVDEC_COMB_DCDIF_THR1_REG06CH_SVIDEO);
+                au8522_writereg(state, AU8522_TVDEC_COMB_DCDIF_THR2_REG06DH,
+                                AU8522_TVDEC_COMB_DCDIF_THR2_REG06DH_SVIDEO);
+        } else {
+                au8522_writereg(state, AU8522_TVDEC_COMB_DCDIF_THR1_REG06CH,
+                                AU8522_TVDEC_COMB_DCDIF_THR1_REG06CH_CVBS);
+                au8522_writereg(state, AU8522_TVDEC_COMB_DCDIF_THR2_REG06DH,
+                                AU8522_TVDEC_COMB_DCDIF_THR2_REG06DH_CVBS);
+        }
         au8522_writereg(state, AU8522_TVDEC_COMB_DCDIF_THR3_REG06EH,
                         AU8522_TVDEC_COMB_DCDIF_THR3_REG06EH_CVBS);
         au8522_writereg(state, AU8522_TVDEC_UV_SEP_THR_REG06FH,
diff --git a/drivers/media/dvb/frontends/au8522_priv.h b/drivers/media/dvb/frontends/au8522_priv.h
index 609cf04bc31..751e17d692a 100644
--- a/drivers/media/dvb/frontends/au8522_priv.h
+++ b/drivers/media/dvb/frontends/au8522_priv.h
@@ -397,7 +397,9 @@ void au8522_release_state(struct au8522_state *state);
 #define AU8522_TVDEC_COMB_HDIF_THR2_REG06AH_CVBS                0x0A
 #define AU8522_TVDEC_COMB_HDIF_THR3_REG06BH_CVBS                0x32
 #define AU8522_TVDEC_COMB_DCDIF_THR1_REG06CH_CVBS               0x34
+#define AU8522_TVDEC_COMB_DCDIF_THR1_REG06CH_SVIDEO             0x2a
 #define AU8522_TVDEC_COMB_DCDIF_THR2_REG06DH_CVBS               0x05
+#define AU8522_TVDEC_COMB_DCDIF_THR2_REG06DH_SVIDEO             0x15
 #define AU8522_TVDEC_COMB_DCDIF_THR3_REG06EH_CVBS               0x6E
 #define AU8522_TVDEC_UV_SEP_THR_REG06FH_CVBS                    0x0F
 #define AU8522_TVDEC_COMB_DC_THR1_NTSC_REG070H_CVBS             0x80