diff options
author | Nickolay V. Shmyrev <nshmyrev@yandex.ru> | 2005-11-09 00:37:01 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 10:56:14 -0500 |
commit | 1eaad5b113811db7fdb6d02e1c8d9ff7c8ba6919 (patch) | |
tree | 65422756ffa9a78be8623a35049aac1a669fba09 /drivers/media/video | |
parent | dc2286cfce214c0de00571f3219a50488c58dd6b (diff) |
[PATCH] v4l: 708: full mute of saa7134 on mute command
- Full mute of saa7134 on mute command.
Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-tvaudio.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/saa7134-tvaudio.c b/drivers/media/video/saa7134/saa7134-tvaudio.c index 61a2d6b50eef..fdca6c563b96 100644 --- a/drivers/media/video/saa7134/saa7134-tvaudio.c +++ b/drivers/media/video/saa7134/saa7134-tvaudio.c | |||
@@ -207,6 +207,10 @@ static void tvaudio_setcarrier(struct saa7134_dev *dev, | |||
207 | saa_writel(SAA7134_CARRIER2_FREQ0 >> 2, tvaudio_carr2reg(secondary)); | 207 | saa_writel(SAA7134_CARRIER2_FREQ0 >> 2, tvaudio_carr2reg(secondary)); |
208 | } | 208 | } |
209 | 209 | ||
210 | #define SAA7134_MUTE_MASK 0xbb | ||
211 | #define SAA7134_MUTE_ANALOG 0x04 | ||
212 | #define SAA7134_MUTE_I2S 0x40 | ||
213 | |||
210 | static void mute_input_7134(struct saa7134_dev *dev) | 214 | static void mute_input_7134(struct saa7134_dev *dev) |
211 | { | 215 | { |
212 | unsigned int mute; | 216 | unsigned int mute; |
@@ -241,7 +245,11 @@ static void mute_input_7134(struct saa7134_dev *dev) | |||
241 | 245 | ||
242 | if (PCI_DEVICE_ID_PHILIPS_SAA7134 == dev->pci->device) | 246 | if (PCI_DEVICE_ID_PHILIPS_SAA7134 == dev->pci->device) |
243 | /* 7134 mute */ | 247 | /* 7134 mute */ |
244 | saa_writeb(SAA7134_AUDIO_MUTE_CTRL, mute ? 0xbf : 0xbb); | 248 | saa_writeb(SAA7134_AUDIO_MUTE_CTRL, mute ? |
249 | SAA7134_MUTE_MASK | | ||
250 | SAA7134_MUTE_ANALOG | | ||
251 | SAA7134_MUTE_I2S : | ||
252 | SAA7134_MUTE_MASK); | ||
245 | 253 | ||
246 | /* switch internal audio mux */ | 254 | /* switch internal audio mux */ |
247 | switch (in->amux) { | 255 | switch (in->amux) { |