diff options
| -rw-r--r-- | drivers/media/video/tda9887.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c index b1ea6aa33166..2fadabf99688 100644 --- a/drivers/media/video/tda9887.c +++ b/drivers/media/video/tda9887.c | |||
| @@ -84,8 +84,7 @@ struct tvnorm { | |||
| 84 | #define cAudioGain6 0x80 // bit c7 | 84 | #define cAudioGain6 0x80 // bit c7 |
| 85 | 85 | ||
| 86 | #define cTopMask 0x1f // bit c0:4 | 86 | #define cTopMask 0x1f // bit c0:4 |
| 87 | #define cTopPalSecamDefault 0x14 // bit c0:4 | 87 | #define cTopDefault 0x10 // bit c0:4 |
| 88 | #define cTopNtscRadioDefault 0x10 // bit c0:4 | ||
| 89 | 88 | ||
| 90 | //// third reg (e) | 89 | //// third reg (e) |
| 91 | #define cAudioIF_4_5 0x00 // bit e0:1 | 90 | #define cAudioIF_4_5 0x00 // bit e0:1 |
| @@ -123,7 +122,7 @@ static struct tvnorm tvnorms[] = { | |||
| 123 | cQSS ), | 122 | cQSS ), |
| 124 | .c = ( cDeemphasisON | | 123 | .c = ( cDeemphasisON | |
| 125 | cDeemphasis50 | | 124 | cDeemphasis50 | |
| 126 | cTopPalSecamDefault), | 125 | cTopDefault), |
| 127 | .e = ( cGating_36 | | 126 | .e = ( cGating_36 | |
| 128 | cAudioIF_5_5 | | 127 | cAudioIF_5_5 | |
| 129 | cVideoIF_38_90 ), | 128 | cVideoIF_38_90 ), |
| @@ -134,7 +133,7 @@ static struct tvnorm tvnorms[] = { | |||
| 134 | cQSS ), | 133 | cQSS ), |
| 135 | .c = ( cDeemphasisON | | 134 | .c = ( cDeemphasisON | |
| 136 | cDeemphasis50 | | 135 | cDeemphasis50 | |
| 137 | cTopPalSecamDefault), | 136 | cTopDefault), |
| 138 | .e = ( cGating_36 | | 137 | .e = ( cGating_36 | |
| 139 | cAudioIF_6_0 | | 138 | cAudioIF_6_0 | |
| 140 | cVideoIF_38_90 ), | 139 | cVideoIF_38_90 ), |
| @@ -145,7 +144,7 @@ static struct tvnorm tvnorms[] = { | |||
| 145 | cQSS ), | 144 | cQSS ), |
| 146 | .c = ( cDeemphasisON | | 145 | .c = ( cDeemphasisON | |
| 147 | cDeemphasis50 | | 146 | cDeemphasis50 | |
| 148 | cTopPalSecamDefault), | 147 | cTopDefault), |
| 149 | .e = ( cGating_36 | | 148 | .e = ( cGating_36 | |
| 150 | cAudioIF_6_5 | | 149 | cAudioIF_6_5 | |
| 151 | cVideoIF_38_90 ), | 150 | cVideoIF_38_90 ), |
| @@ -156,7 +155,7 @@ static struct tvnorm tvnorms[] = { | |||
| 156 | cQSS ), | 155 | cQSS ), |
| 157 | .c = ( cDeemphasisON | | 156 | .c = ( cDeemphasisON | |
| 158 | cDeemphasis75 | | 157 | cDeemphasis75 | |
| 159 | cTopNtscRadioDefault), | 158 | cTopDefault), |
| 160 | .e = ( cGating_36 | | 159 | .e = ( cGating_36 | |
| 161 | cAudioIF_4_5 | | 160 | cAudioIF_4_5 | |
| 162 | cVideoIF_45_75 ), | 161 | cVideoIF_45_75 ), |
| @@ -165,7 +164,7 @@ static struct tvnorm tvnorms[] = { | |||
| 165 | .name = "SECAM-BGH", | 164 | .name = "SECAM-BGH", |
| 166 | .b = ( cPositiveAmTV | | 165 | .b = ( cPositiveAmTV | |
| 167 | cQSS ), | 166 | cQSS ), |
| 168 | .c = ( cTopPalSecamDefault), | 167 | .c = ( cTopDefault), |
| 169 | .e = ( cGating_36 | | 168 | .e = ( cGating_36 | |
| 170 | cAudioIF_5_5 | | 169 | cAudioIF_5_5 | |
| 171 | cVideoIF_38_90 ), | 170 | cVideoIF_38_90 ), |
| @@ -174,7 +173,7 @@ static struct tvnorm tvnorms[] = { | |||
| 174 | .name = "SECAM-L", | 173 | .name = "SECAM-L", |
| 175 | .b = ( cPositiveAmTV | | 174 | .b = ( cPositiveAmTV | |
| 176 | cQSS ), | 175 | cQSS ), |
| 177 | .c = ( cTopPalSecamDefault), | 176 | .c = ( cTopDefault), |
| 178 | .e = ( cGating_36 | | 177 | .e = ( cGating_36 | |
| 179 | cAudioIF_6_5 | | 178 | cAudioIF_6_5 | |
| 180 | cVideoIF_38_90 ), | 179 | cVideoIF_38_90 ), |
| @@ -184,7 +183,7 @@ static struct tvnorm tvnorms[] = { | |||
| 184 | .b = ( cOutputPort2Inactive | | 183 | .b = ( cOutputPort2Inactive | |
| 185 | cPositiveAmTV | | 184 | cPositiveAmTV | |
| 186 | cQSS ), | 185 | cQSS ), |
| 187 | .c = ( cTopPalSecamDefault), | 186 | .c = ( cTopDefault), |
| 188 | .e = ( cGating_36 | | 187 | .e = ( cGating_36 | |
| 189 | cAudioIF_6_5 | | 188 | cAudioIF_6_5 | |
| 190 | cVideoIF_33_90 ), | 189 | cVideoIF_33_90 ), |
| @@ -195,7 +194,7 @@ static struct tvnorm tvnorms[] = { | |||
| 195 | cQSS ), | 194 | cQSS ), |
| 196 | .c = ( cDeemphasisON | | 195 | .c = ( cDeemphasisON | |
| 197 | cDeemphasis50 | | 196 | cDeemphasis50 | |
| 198 | cTopPalSecamDefault), | 197 | cTopDefault), |
| 199 | .e = ( cGating_36 | | 198 | .e = ( cGating_36 | |
| 200 | cAudioIF_6_5 | | 199 | cAudioIF_6_5 | |
| 201 | cVideoIF_38_90 ), | 200 | cVideoIF_38_90 ), |
| @@ -206,7 +205,7 @@ static struct tvnorm tvnorms[] = { | |||
| 206 | cQSS ), | 205 | cQSS ), |
| 207 | .c = ( cDeemphasisON | | 206 | .c = ( cDeemphasisON | |
| 208 | cDeemphasis75 | | 207 | cDeemphasis75 | |
| 209 | cTopNtscRadioDefault), | 208 | cTopDefault), |
| 210 | .e = ( cGating_36 | | 209 | .e = ( cGating_36 | |
| 211 | cAudioIF_4_5 | | 210 | cAudioIF_4_5 | |
| 212 | cVideoIF_45_75 ), | 211 | cVideoIF_45_75 ), |
| @@ -217,7 +216,7 @@ static struct tvnorm tvnorms[] = { | |||
| 217 | cQSS ), | 216 | cQSS ), |
| 218 | .c = ( cDeemphasisON | | 217 | .c = ( cDeemphasisON | |
| 219 | cDeemphasis50 | | 218 | cDeemphasis50 | |
| 220 | cTopNtscRadioDefault), | 219 | cTopDefault), |
| 221 | .e = ( cGating_36 | | 220 | .e = ( cGating_36 | |
| 222 | cAudioIF_4_5 | | 221 | cAudioIF_4_5 | |
| 223 | cVideoIF_58_75 ), | 222 | cVideoIF_58_75 ), |
| @@ -230,7 +229,7 @@ static struct tvnorm radio_stereo = { | |||
| 230 | cQSS ), | 229 | cQSS ), |
| 231 | .c = ( cDeemphasisOFF | | 230 | .c = ( cDeemphasisOFF | |
| 232 | cAudioGain6 | | 231 | cAudioGain6 | |
| 233 | cTopNtscRadioDefault), | 232 | cTopDefault), |
| 234 | .e = ( cTunerGainLow | | 233 | .e = ( cTunerGainLow | |
| 235 | cAudioIF_5_5 | | 234 | cAudioIF_5_5 | |
| 236 | cRadioIF_38_90 ), | 235 | cRadioIF_38_90 ), |
| @@ -242,7 +241,7 @@ static struct tvnorm radio_mono = { | |||
| 242 | cQSS ), | 241 | cQSS ), |
| 243 | .c = ( cDeemphasisON | | 242 | .c = ( cDeemphasisON | |
| 244 | cDeemphasis75 | | 243 | cDeemphasis75 | |
| 245 | cTopNtscRadioDefault), | 244 | cTopDefault), |
| 246 | .e = ( cTunerGainLow | | 245 | .e = ( cTunerGainLow | |
| 247 | cAudioIF_5_5 | | 246 | cAudioIF_5_5 | |
| 248 | cRadioIF_38_90 ), | 247 | cRadioIF_38_90 ), |