ALSA: emu10k1: move code for entering E-MU card FPGA programming mode

... into snd_emu1010_load_firmware_entry(). This makes it clearer that
these steps belong together tightly, as implied by prior commits.

Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Message-ID: <20240428093717.3198716-5-oswald.buddenhagen@gmx.de>

diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h
index 2856f4717c93eb5148a2e1e45a4dafd2ed80c39d..b83862259eece4d9ae19f9884236c75e377288e8 100644 (file)
--- a/include/sound/emu10k1.h
+++ b/include/sound/emu10k1.h
@@ -1843,7 +1843,7 @@ void snd_emu1010_fpga_link_dst_src_write(struct snd_emu10k1 *emu, u32 dst, u32 s
 u32 snd_emu1010_fpga_link_dst_src_read(struct snd_emu10k1 *emu, u32 dst);
 int snd_emu1010_get_raw_rate(struct snd_emu10k1 *emu, u8 src);
 void snd_emu1010_update_clock(struct snd_emu10k1 *emu);
-void snd_emu1010_load_firmware_entry(struct snd_emu10k1 *emu, const struct firmware *fw_entry);
+void snd_emu1010_load_firmware_entry(struct snd_emu10k1 *emu, int dock, const struct firmware *fw_entry);
 unsigned int snd_emu10k1_efx_read(struct snd_emu10k1 *emu, unsigned int pc);
 void snd_emu10k1_intr_enable(struct snd_emu10k1 *emu, unsigned int intrenb);
 void snd_emu10k1_intr_disable(struct snd_emu10k1 *emu, unsigned int intrenb);

diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index c8aa4143ac4fee67987b3bcbb101e377b9eb2c3a..5b8a5ba825bdb2555cec7a13def744b062b50fa5 100644 (file)
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -683,7 +683,7 @@ static int snd_emu1010_load_firmware(struct snd_emu10k1 *emu, int dock,
                        return err;
        }
 
-       snd_emu1010_load_firmware_entry(emu, *fw);
+       snd_emu1010_load_firmware_entry(emu, dock, *fw);
        return 0;
 }
 
@@ -699,9 +699,6 @@ static void snd_emu1010_load_dock_firmware(struct snd_emu10k1 *emu)
        msleep(200);
 
        dev_info(emu->card->dev, "emu1010: Loading Audio Dock Firmware\n");
-       /* Return to Audio Dock programming mode */
-       snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG,
-                              EMU_HANA_FPGA_CONFIG_AUDIODOCK);
        err = snd_emu1010_load_firmware(emu, 1, &emu->dock_fw);
        if (err < 0)
                return;
@@ -820,8 +817,6 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
        snd_emu1010_fpga_lock(emu);
 
        dev_info(emu->card->dev, "emu1010: Loading Hana Firmware\n");
-       snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG,
-                              EMU_HANA_FPGA_CONFIG_HANA);
        err = snd_emu1010_load_firmware(emu, 0, &emu->firmware);
        if (err < 0) {
                dev_info(emu->card->dev, "emu1010: Loading Firmware failed\n");

diff --git a/sound/pci/emu10k1/io.c b/sound/pci/emu10k1/io.c
index fafa299efa5c586fb46bccc2ea496938de2e3e18..b60ab5671e00dccbf77397fce3cae8fe37ca78e3 100644 (file)
--- a/sound/pci/emu10k1/io.c
+++ b/sound/pci/emu10k1/io.c
@@ -422,7 +422,7 @@ void snd_emu1010_update_clock(struct snd_emu10k1 *emu)
        snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, leds);
 }
 
-void snd_emu1010_load_firmware_entry(struct snd_emu10k1 *emu,
+void snd_emu1010_load_firmware_entry(struct snd_emu10k1 *emu, int dock,
                                     const struct firmware *fw_entry)
 {
        __always_unused u16 write_post;
@@ -440,6 +440,11 @@ void snd_emu1010_load_firmware_entry(struct snd_emu10k1 *emu,
        // GPO6 -> FPGA CCLK & FPGA input
        // GPO5 -> FPGA DIN (dual function)
 
+       // If the FPGA is already programmed, return it to programming mode
+       snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG,
+                              dock ? EMU_HANA_FPGA_CONFIG_AUDIODOCK :
+                                     EMU_HANA_FPGA_CONFIG_HANA);
+
        // Assert reset line for 100uS
        outw(0x00, emu->port + A_GPIO);
        write_post = inw(emu->port + A_GPIO);