diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-07-18 13:53:29 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-07-18 13:53:29 +0200 |
| commit | f0913cd16e8a6608cf9558ccbe8fdf4d428ca3de (patch) | |
| tree | d6ea8cc44a9d55d29d38605165a09cf69ff9a536 /sound/pci/pcxhr/pcxhr_mix22.c | |
| parent | 61eab000f3536f080eab43fd5eed3fd817ded76e (diff) | |
| parent | 59b1f084abd8690ffe68c67758ad08bbcb7d1af0 (diff) | |
| download | linux-f0913cd16e8a6608cf9558ccbe8fdf4d428ca3de.tar.gz linux-f0913cd16e8a6608cf9558ccbe8fdf4d428ca3de.tar.bz2 linux-f0913cd16e8a6608cf9558ccbe8fdf4d428ca3de.zip | |
Merge branch 'topic/misc' into for-next
Generic updates for sound 3.6
Diffstat (limited to 'sound/pci/pcxhr/pcxhr_mix22.c')
| -rw-r--r-- | sound/pci/pcxhr/pcxhr_mix22.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sound/pci/pcxhr/pcxhr_mix22.c b/sound/pci/pcxhr/pcxhr_mix22.c index 1cb82c0a9cb3..84fe57626eba 100644 --- a/sound/pci/pcxhr/pcxhr_mix22.c +++ b/sound/pci/pcxhr/pcxhr_mix22.c @@ -53,6 +53,7 @@ #define PCXHR_DSP_RESET_DSP 0x01 #define PCXHR_DSP_RESET_MUTE 0x02 #define PCXHR_DSP_RESET_CODEC 0x08 +#define PCXHR_DSP_RESET_SMPTE 0x10 #define PCXHR_DSP_RESET_GPO_OFFSET 5 #define PCXHR_DSP_RESET_GPO_MASK 0x60 @@ -527,6 +528,16 @@ int hr222_write_gpo(struct pcxhr_mgr *mgr, int value) return 0; } +int hr222_manage_timecode(struct pcxhr_mgr *mgr, int enable) +{ + if (enable) + mgr->dsp_reset |= PCXHR_DSP_RESET_SMPTE; + else + mgr->dsp_reset &= ~PCXHR_DSP_RESET_SMPTE; + + PCXHR_OUTPB(mgr, PCXHR_DSP_RESET, mgr->dsp_reset); + return 0; +} int hr222_update_analog_audio_level(struct snd_pcxhr *chip, int is_capture, int channel) |