Commit 462d972d authored by Oswald Buddenhagen's avatar Oswald Buddenhagen Committed by Takashi Iwai
Browse files

ALSA: emu10k1: remove apparently pointless FPGA reads 



These seem to be simply cargo-culted from the Windows driver's behavior.
However, the original reason were presumably read-modify-write cycles,
which we don't do.

Signed-off-by: default avatarOswald Buddenhagen <oswald.buddenhagen@gmx.de>
Link: https://lore.kernel.org/r/20230421141006.1005539-5-oswald.buddenhagen@gmx.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 384e396f

sound/pci/emu10k1/emu10k1_main.c

+0 −7
Original line number Diff line number Diff line
@@ -885,7 +885,6 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu) 
	dev_info(emu->card->dev, "emu1010: Card options = 0x%x\n", reg);

	snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg);

	dev_info(emu->card->dev, "emu1010: Card options = 0x%x\n", reg);

	snd_emu1010_fpga_read(emu, EMU_HANA_OPTICAL_TYPE, &tmp);

	/* Optical -> ADAT I/O  */

	/* 0 : SPDIF

	 * 1 : ADAT
@@ -896,21 +895,16 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu) 
	tmp = (emu->emu1010.optical_in ? EMU_HANA_OPTICAL_IN_ADAT : 0) |

		(emu->emu1010.optical_out ? EMU_HANA_OPTICAL_OUT_ADAT : 0);

	snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, tmp);

	snd_emu1010_fpga_read(emu, EMU_HANA_ADC_PADS, &tmp);

	/* Set no attenuation on Audio Dock pads. */

	snd_emu1010_fpga_write(emu, EMU_HANA_ADC_PADS, 0x00);

	emu->emu1010.adc_pads = 0x00;

	snd_emu1010_fpga_read(emu, EMU_HANA_DOCK_MISC, &tmp);

	/* Unmute Audio dock DACs, Headphone source DAC-4. */

	snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_MISC, 0x30);

	snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, 0x12);

	snd_emu1010_fpga_read(emu, EMU_HANA_DAC_PADS, &tmp);

	/* DAC PADs. */

	snd_emu1010_fpga_write(emu, EMU_HANA_DAC_PADS, 0x0f);

	emu->emu1010.dac_pads = 0x0f;

	snd_emu1010_fpga_read(emu, EMU_HANA_DOCK_MISC, &tmp);

	snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_MISC, 0x30);

	snd_emu1010_fpga_read(emu, EMU_HANA_SPDIF_MODE, &tmp);

	/* SPDIF Format. Set Consumer mode, 24bit, copy enable */

	snd_emu1010_fpga_write(emu, EMU_HANA_SPDIF_MODE, 0x10);

	/* MIDI routing */
@@ -1068,7 +1062,6 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu) 
	snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, 0x0c); /* Unknown */

	snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, 0x19); /* MIDI Route */

	snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, 0x0c); /* Unknown */

	snd_emu1010_fpga_read(emu, EMU_HANA_SPDIF_MODE, &tmp);

	snd_emu1010_fpga_write(emu, EMU_HANA_SPDIF_MODE, 0x10); /* SPDIF Format spdif  (or 0x11 for aes/ebu) */



#if 0