diff options
| author | James Courtier-Dutton <James@superbug.co.uk> | 2007-07-23 15:30:22 -0400 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2007-10-16 09:57:53 -0400 |
| commit | edec7bbb22dafdab5f8eae4f049ad9d0f615abc4 (patch) | |
| tree | 42d4bd8e1714d68b126a5266eb14e6f520e39ed7 /sound/pci/emu10k1/emu10k1_main.c | |
| parent | aaccf54f638dfd39ebd1220936b0ce261e5fced7 (diff) | |
[ALSA] snd-emu10k1:Support for ADAT and S/PDIF.
Patch submitted by Ctirad Fertr
<c.fertr@volny.cz>
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/emu10k1/emu10k1_main.c')
| -rw-r--r-- | sound/pci/emu10k1/emu10k1_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index 800d6348de71..b985e660c60b 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c | |||
| @@ -872,8 +872,8 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 * emu) | |||
| 872 | snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, ® ); | 872 | snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, ® ); |
| 873 | snd_printk(KERN_INFO "emu1010: Card options=0x%x\n",reg); | 873 | snd_printk(KERN_INFO "emu1010: Card options=0x%x\n",reg); |
| 874 | snd_emu1010_fpga_read(emu, EMU_HANA_OPTICAL_TYPE, &tmp ); | 874 | snd_emu1010_fpga_read(emu, EMU_HANA_OPTICAL_TYPE, &tmp ); |
| 875 | /* ADAT input. */ | 875 | /* Optical -> ADAT I/O */ |
| 876 | snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, 0x01 ); | 876 | snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, EMU_HANA_OPTICAL_IN_ADAT | EMU_HANA_OPTICAL_OUT_ADAT ); |
| 877 | snd_emu1010_fpga_read(emu, EMU_HANA_ADC_PADS, &tmp ); | 877 | snd_emu1010_fpga_read(emu, EMU_HANA_ADC_PADS, &tmp ); |
| 878 | /* Set no attenuation on Audio Dock pads. */ | 878 | /* Set no attenuation on Audio Dock pads. */ |
| 879 | snd_emu1010_fpga_write(emu, EMU_HANA_ADC_PADS, 0x00 ); | 879 | snd_emu1010_fpga_write(emu, EMU_HANA_ADC_PADS, 0x00 ); |
| @@ -1150,7 +1150,7 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 * emu) | |||
| 1150 | emu->emu1010.output_source[23] = 28; | 1150 | emu->emu1010.output_source[23] = 28; |
| 1151 | 1151 | ||
| 1152 | /* TEMP: Select SPDIF in/out */ | 1152 | /* TEMP: Select SPDIF in/out */ |
| 1153 | snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, 0x0); /* Output spdif */ | 1153 | //snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, 0x0); /* Output spdif */ |
| 1154 | 1154 | ||
| 1155 | /* TEMP: Select 48kHz SPDIF out */ | 1155 | /* TEMP: Select 48kHz SPDIF out */ |
| 1156 | snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, 0x0); /* Mute all */ | 1156 | snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, 0x0); /* Mute all */ |