@@ -889,7 +889,6 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
889889 */
890890 emu -> emu1010 .optical_in = 1 ; /* IN_ADAT */
891891 emu -> emu1010 .optical_out = 1 ; /* IN_ADAT */
892- tmp = 0 ;
893892 tmp = (emu -> emu1010 .optical_in ? EMU_HANA_OPTICAL_IN_ADAT : 0 ) |
894893 (emu -> emu1010 .optical_out ? EMU_HANA_OPTICAL_OUT_ADAT : 0 );
895894 snd_emu1010_fpga_write (emu , EMU_HANA_OPTICAL_TYPE , tmp );
@@ -898,11 +897,9 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
898897 emu -> emu1010 .adc_pads = 0x00 ;
899898 /* Unmute Audio dock DACs, Headphone source DAC-4. */
900899 snd_emu1010_fpga_write (emu , EMU_HANA_DOCK_MISC , 0x30 );
901- snd_emu1010_fpga_write (emu , EMU_HANA_DOCK_LEDS_2 , 0x12 );
902900 /* DAC PADs. */
903901 snd_emu1010_fpga_write (emu , EMU_HANA_DAC_PADS , 0x0f );
904902 emu -> emu1010 .dac_pads = 0x0f ;
905- snd_emu1010_fpga_write (emu , EMU_HANA_DOCK_MISC , 0x30 );
906903 /* SPDIF Format. Set Consumer mode, 24bit, copy enable */
907904 snd_emu1010_fpga_write (emu , EMU_HANA_SPDIF_MODE , 0x10 );
908905 /* MIDI routing */
@@ -914,6 +911,7 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
914911 /* IRQ Enable: All off */
915912 snd_emu1010_fpga_write (emu , EMU_HANA_IRQ_ENABLE , 0x00 );
916913
914+ emu -> emu1010 .internal_clock = 1 ; /* 48000 */
917915 /* Default WCLK set to 48kHz. */
918916 snd_emu1010_fpga_write (emu , EMU_HANA_DEFCLOCK , 0x00 );
919917 /* Word Clock source, Internal 48kHz x1 */
@@ -1049,14 +1047,6 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
10491047 EMU_DST_ALICE_I2S2_RIGHT , EMU_SRC_DOCK_ADC3_RIGHT1 );
10501048 snd_emu1010_fpga_write (emu , EMU_HANA_UNMUTE , 0x01 ); /* Unmute all */
10511049
1052- /* Initial boot complete. Now patches */
1053-
1054- snd_emu1010_fpga_write (emu , EMU_HANA_MIDI_IN , 0x19 ); /* MIDI Route */
1055- snd_emu1010_fpga_write (emu , EMU_HANA_MIDI_OUT , 0x0c ); /* Unknown */
1056- snd_emu1010_fpga_write (emu , EMU_HANA_MIDI_IN , 0x19 ); /* MIDI Route */
1057- snd_emu1010_fpga_write (emu , EMU_HANA_MIDI_OUT , 0x0c ); /* Unknown */
1058- snd_emu1010_fpga_write (emu , EMU_HANA_SPDIF_MODE , 0x10 ); /* SPDIF Format spdif (or 0x11 for aes/ebu) */
1059-
10601050#if 0
10611051 snd_emu1010_fpga_link_dst_src_write (emu ,
10621052 EMU_DST_HAMOA_DAC_LEFT1 , EMU_SRC_ALICE_EMU32B + 2 ); /* ALICE2 bus 0xa2 */
@@ -1176,21 +1166,6 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
11761166 EMU_DST_HANA_ADAT + 7 , EMU_SRC_ALICE_EMU32A + 7 );
11771167 emu -> emu1010 .output_source [23 ] = 28 ;
11781168 }
1179- /* TEMP: Select SPDIF in/out */
1180- /* snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, 0x0); */ /* Output spdif */
1181-
1182- /* TEMP: Select 48kHz SPDIF out */
1183- snd_emu1010_fpga_write (emu , EMU_HANA_UNMUTE , 0x0 ); /* Mute all */
1184- snd_emu1010_fpga_write (emu , EMU_HANA_DEFCLOCK , 0x0 ); /* Default fallback clock 48kHz */
1185- /* Word Clock source, Internal 48kHz x1 */
1186- snd_emu1010_fpga_write (emu , EMU_HANA_WCLOCK , EMU_HANA_WCLOCK_INT_48K );
1187- /* snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K | EMU_HANA_WCLOCK_4X); */
1188- emu -> emu1010 .internal_clock = 1 ; /* 48000 */
1189- snd_emu1010_fpga_write (emu , EMU_HANA_DOCK_LEDS_2 , 0x12 ); /* Set LEDs on Audio Dock */
1190- snd_emu1010_fpga_write (emu , EMU_HANA_UNMUTE , 0x1 ); /* Unmute all */
1191- /* snd_emu1010_fpga_write(emu, 0x7, 0x0); */ /* Mute all */
1192- /* snd_emu1010_fpga_write(emu, 0x7, 0x1); */ /* Unmute all */
1193- /* snd_emu1010_fpga_write(emu, 0xe, 0x12); */ /* Set LEDs on Audio Dock */
11941169
11951170 return 0 ;
11961171}
0 commit comments