ソースを参照

V4L/DVB (4255): Tda9887 default TOP value is 0x10

For most tuners the default TOP value is 0x10, regardless of TV norm.
So revert earlier change that sets the TOP value to 0x14 for PAL/SECAM.
This is incorrect.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Hans Verkuil 19 年 前
コミット
f5b0142ad6
1 ファイル変更13 行追加14 行削除
  1. 13 14
      drivers/media/video/tda9887.c

+ 13 - 14
drivers/media/video/tda9887.c

@@ -84,8 +84,7 @@ struct tvnorm {
 #define cAudioGain6             0x80    // bit c7
 #define cAudioGain6             0x80    // bit c7
 
 
 #define cTopMask                0x1f    // bit c0:4
 #define cTopMask                0x1f    // bit c0:4
-#define cTopPalSecamDefault	0x14 	// bit c0:4
-#define cTopNtscRadioDefault 	0x10 	// bit c0:4
+#define cTopDefault		0x10 	// bit c0:4
 
 
 //// third reg (e)
 //// third reg (e)
 #define cAudioIF_4_5             0x00    // bit e0:1
 #define cAudioIF_4_5             0x00    // bit e0:1
@@ -123,7 +122,7 @@ static struct tvnorm tvnorms[] = {
 			   cQSS           ),
 			   cQSS           ),
 		.c     = ( cDeemphasisON  |
 		.c     = ( cDeemphasisON  |
 			   cDeemphasis50  |
 			   cDeemphasis50  |
-			   cTopPalSecamDefault),
+			   cTopDefault),
 		.e     = ( cGating_36     |
 		.e     = ( cGating_36     |
 			   cAudioIF_5_5   |
 			   cAudioIF_5_5   |
 			   cVideoIF_38_90 ),
 			   cVideoIF_38_90 ),
@@ -134,7 +133,7 @@ static struct tvnorm tvnorms[] = {
 			   cQSS           ),
 			   cQSS           ),
 		.c     = ( cDeemphasisON  |
 		.c     = ( cDeemphasisON  |
 			   cDeemphasis50  |
 			   cDeemphasis50  |
-			   cTopPalSecamDefault),
+			   cTopDefault),
 		.e     = ( cGating_36     |
 		.e     = ( cGating_36     |
 			   cAudioIF_6_0   |
 			   cAudioIF_6_0   |
 			   cVideoIF_38_90 ),
 			   cVideoIF_38_90 ),
@@ -145,7 +144,7 @@ static struct tvnorm tvnorms[] = {
 			   cQSS           ),
 			   cQSS           ),
 		.c     = ( cDeemphasisON  |
 		.c     = ( cDeemphasisON  |
 			   cDeemphasis50  |
 			   cDeemphasis50  |
-			   cTopPalSecamDefault),
+			   cTopDefault),
 		.e     = ( cGating_36     |
 		.e     = ( cGating_36     |
 			   cAudioIF_6_5   |
 			   cAudioIF_6_5   |
 			   cVideoIF_38_90 ),
 			   cVideoIF_38_90 ),
@@ -156,7 +155,7 @@ static struct tvnorm tvnorms[] = {
 			   cQSS           ),
 			   cQSS           ),
 		.c     = ( cDeemphasisON  |
 		.c     = ( cDeemphasisON  |
 			   cDeemphasis75  |
 			   cDeemphasis75  |
-			   cTopNtscRadioDefault),
+			   cTopDefault),
 		.e     = ( cGating_36     |
 		.e     = ( cGating_36     |
 			   cAudioIF_4_5   |
 			   cAudioIF_4_5   |
 			   cVideoIF_45_75 ),
 			   cVideoIF_45_75 ),
@@ -165,7 +164,7 @@ static struct tvnorm tvnorms[] = {
 		.name  = "SECAM-BGH",
 		.name  = "SECAM-BGH",
 		.b     = ( cPositiveAmTV  |
 		.b     = ( cPositiveAmTV  |
 			   cQSS           ),
 			   cQSS           ),
-		.c     = ( cTopPalSecamDefault),
+		.c     = ( cTopDefault),
 		.e     = ( cGating_36	  |
 		.e     = ( cGating_36	  |
 			   cAudioIF_5_5   |
 			   cAudioIF_5_5   |
 			   cVideoIF_38_90 ),
 			   cVideoIF_38_90 ),
@@ -174,7 +173,7 @@ static struct tvnorm tvnorms[] = {
 		.name  = "SECAM-L",
 		.name  = "SECAM-L",
 		.b     = ( cPositiveAmTV  |
 		.b     = ( cPositiveAmTV  |
 			   cQSS           ),
 			   cQSS           ),
-		.c     = ( cTopPalSecamDefault),
+		.c     = ( cTopDefault),
 		.e     = ( cGating_36	  |
 		.e     = ( cGating_36	  |
 			   cAudioIF_6_5   |
 			   cAudioIF_6_5   |
 			   cVideoIF_38_90 ),
 			   cVideoIF_38_90 ),
@@ -184,7 +183,7 @@ static struct tvnorm tvnorms[] = {
 		.b     = ( cOutputPort2Inactive |
 		.b     = ( cOutputPort2Inactive |
 			   cPositiveAmTV  |
 			   cPositiveAmTV  |
 			   cQSS           ),
 			   cQSS           ),
-		.c     = ( cTopPalSecamDefault),
+		.c     = ( cTopDefault),
 		.e     = ( cGating_36	  |
 		.e     = ( cGating_36	  |
 			   cAudioIF_6_5   |
 			   cAudioIF_6_5   |
 			   cVideoIF_33_90 ),
 			   cVideoIF_33_90 ),
@@ -195,7 +194,7 @@ static struct tvnorm tvnorms[] = {
 			   cQSS           ),
 			   cQSS           ),
 		.c     = ( cDeemphasisON  |
 		.c     = ( cDeemphasisON  |
 			   cDeemphasis50  |
 			   cDeemphasis50  |
-			   cTopPalSecamDefault),
+			   cTopDefault),
 		.e     = ( cGating_36     |
 		.e     = ( cGating_36     |
 			   cAudioIF_6_5   |
 			   cAudioIF_6_5   |
 			   cVideoIF_38_90 ),
 			   cVideoIF_38_90 ),
@@ -206,7 +205,7 @@ static struct tvnorm tvnorms[] = {
 			   cQSS           ),
 			   cQSS           ),
 		.c     = ( cDeemphasisON  |
 		.c     = ( cDeemphasisON  |
 			   cDeemphasis75  |
 			   cDeemphasis75  |
-			   cTopNtscRadioDefault),
+			   cTopDefault),
 		.e     = ( cGating_36     |
 		.e     = ( cGating_36     |
 			   cAudioIF_4_5   |
 			   cAudioIF_4_5   |
 			   cVideoIF_45_75 ),
 			   cVideoIF_45_75 ),
@@ -217,7 +216,7 @@ static struct tvnorm tvnorms[] = {
 			   cQSS           ),
 			   cQSS           ),
 		.c     = ( cDeemphasisON  |
 		.c     = ( cDeemphasisON  |
 			   cDeemphasis50  |
 			   cDeemphasis50  |
-			   cTopNtscRadioDefault),
+			   cTopDefault),
 		.e     = ( cGating_36     |
 		.e     = ( cGating_36     |
 			   cAudioIF_4_5   |
 			   cAudioIF_4_5   |
 			   cVideoIF_58_75 ),
 			   cVideoIF_58_75 ),
@@ -230,7 +229,7 @@ static struct tvnorm radio_stereo = {
 		  cQSS           ),
 		  cQSS           ),
 	.c    = ( cDeemphasisOFF |
 	.c    = ( cDeemphasisOFF |
 		  cAudioGain6    |
 		  cAudioGain6    |
-		  cTopNtscRadioDefault),
+		  cTopDefault),
 	.e    = ( cTunerGainLow  |
 	.e    = ( cTunerGainLow  |
 		  cAudioIF_5_5   |
 		  cAudioIF_5_5   |
 		  cRadioIF_38_90 ),
 		  cRadioIF_38_90 ),
@@ -242,7 +241,7 @@ static struct tvnorm radio_mono = {
 		  cQSS           ),
 		  cQSS           ),
 	.c    = ( cDeemphasisON  |
 	.c    = ( cDeemphasisON  |
 		  cDeemphasis75  |
 		  cDeemphasis75  |
-		  cTopNtscRadioDefault),
+		  cTopDefault),
 	.e    = ( cTunerGainLow  |
 	.e    = ( cTunerGainLow  |
 		  cAudioIF_5_5   |
 		  cAudioIF_5_5   |
 		  cRadioIF_38_90 ),
 		  cRadioIF_38_90 ),