diff options
-rw-r--r-- | include/sound/tea575x-tuner.h | 3 | ||||
-rw-r--r-- | sound/i2c/other/tea575x-tuner.c | 8 | ||||
-rw-r--r-- | sound/pci/es1968.c | 1 | ||||
-rw-r--r-- | sound/pci/fm801.c | 1 |
4 files changed, 6 insertions, 7 deletions
diff --git a/include/sound/tea575x-tuner.h b/include/sound/tea575x-tuner.h index e50cb2934efe..0291f48e035e 100644 --- a/include/sound/tea575x-tuner.h +++ b/include/sound/tea575x-tuner.h | |||
@@ -26,6 +26,8 @@ | |||
26 | #include <media/v4l2-dev.h> | 26 | #include <media/v4l2-dev.h> |
27 | #include <media/v4l2-ioctl.h> | 27 | #include <media/v4l2-ioctl.h> |
28 | 28 | ||
29 | #define TEA575X_FMIF 10700 | ||
30 | |||
29 | #define TEA575X_DATA (1 << 0) | 31 | #define TEA575X_DATA (1 << 0) |
30 | #define TEA575X_CLK (1 << 1) | 32 | #define TEA575X_CLK (1 << 1) |
31 | #define TEA575X_WREN (1 << 2) | 33 | #define TEA575X_WREN (1 << 2) |
@@ -46,7 +48,6 @@ struct snd_tea575x { | |||
46 | bool mute; /* Device is muted? */ | 48 | bool mute; /* Device is muted? */ |
47 | bool stereo; /* receiving stereo */ | 49 | bool stereo; /* receiving stereo */ |
48 | bool tuned; /* tuned to a station */ | 50 | bool tuned; /* tuned to a station */ |
49 | unsigned int freq_fixup; /* crystal onboard */ | ||
50 | unsigned int val; /* hw value */ | 51 | unsigned int val; /* hw value */ |
51 | unsigned long freq; /* frequency */ | 52 | unsigned long freq; /* frequency */ |
52 | unsigned long in_use; /* set if the device is in use */ | 53 | unsigned long in_use; /* set if the device is in use */ |
diff --git a/sound/i2c/other/tea575x-tuner.c b/sound/i2c/other/tea575x-tuner.c index 31f9795daca6..98ccec27e7bf 100644 --- a/sound/i2c/other/tea575x-tuner.c +++ b/sound/i2c/other/tea575x-tuner.c | |||
@@ -141,9 +141,9 @@ static void snd_tea575x_get_freq(struct snd_tea575x *tea) | |||
141 | freq /= 10; | 141 | freq /= 10; |
142 | /* crystal fixup */ | 142 | /* crystal fixup */ |
143 | if (tea->tea5759) | 143 | if (tea->tea5759) |
144 | freq += tea->freq_fixup; | 144 | freq += TEA575X_FMIF; |
145 | else | 145 | else |
146 | freq -= tea->freq_fixup; | 146 | freq -= TEA575X_FMIF; |
147 | 147 | ||
148 | tea->freq = freq * 16; /* from kHz */ | 148 | tea->freq = freq * 16; /* from kHz */ |
149 | } | 149 | } |
@@ -156,9 +156,9 @@ static void snd_tea575x_set_freq(struct snd_tea575x *tea) | |||
156 | freq /= 16; /* to kHz */ | 156 | freq /= 16; /* to kHz */ |
157 | /* crystal fixup */ | 157 | /* crystal fixup */ |
158 | if (tea->tea5759) | 158 | if (tea->tea5759) |
159 | freq -= tea->freq_fixup; | 159 | freq -= TEA575X_FMIF; |
160 | else | 160 | else |
161 | freq += tea->freq_fixup; | 161 | freq += TEA575X_FMIF; |
162 | /* freq /= 12.5 */ | 162 | /* freq /= 12.5 */ |
163 | freq *= 10; | 163 | freq *= 10; |
164 | freq /= 125; | 164 | freq /= 125; |
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index 75c5e0ed6955..3f3ff1bae814 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c | |||
@@ -2794,7 +2794,6 @@ static int __devinit snd_es1968_create(struct snd_card *card, | |||
2794 | 2794 | ||
2795 | #ifdef CONFIG_SND_ES1968_RADIO | 2795 | #ifdef CONFIG_SND_ES1968_RADIO |
2796 | chip->tea.card = card; | 2796 | chip->tea.card = card; |
2797 | chip->tea.freq_fixup = 10700; | ||
2798 | chip->tea.private_data = chip; | 2797 | chip->tea.private_data = chip; |
2799 | chip->tea.ops = &snd_es1968_tea_ops; | 2798 | chip->tea.ops = &snd_es1968_tea_ops; |
2800 | if (!snd_tea575x_init(&chip->tea)) | 2799 | if (!snd_tea575x_init(&chip->tea)) |
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c index 5aa3fd6f25f7..1d4e71cc18b6 100644 --- a/sound/pci/fm801.c +++ b/sound/pci/fm801.c | |||
@@ -1231,7 +1231,6 @@ static int __devinit snd_fm801_create(struct snd_card *card, | |||
1231 | 1231 | ||
1232 | #ifdef TEA575X_RADIO | 1232 | #ifdef TEA575X_RADIO |
1233 | chip->tea.card = card; | 1233 | chip->tea.card = card; |
1234 | chip->tea.freq_fixup = 10700; | ||
1235 | chip->tea.private_data = chip; | 1234 | chip->tea.private_data = chip; |
1236 | chip->tea.ops = &snd_fm801_tea_ops; | 1235 | chip->tea.ops = &snd_fm801_tea_ops; |
1237 | if ((tea575x_tuner & TUNER_TYPE_MASK) > 0 && | 1236 | if ((tea575x_tuner & TUNER_TYPE_MASK) > 0 && |