lkml.org 
[lkml]   [2020]   [May]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 35/59] ALSA: iec1712: Initialize STDSP24 properly when using the model=staudio option
    Date
    From: Scott Bahling <sbahling@suse.com>

    commit b0cb099062b0c18246c3a20caaab4c0afc303255 upstream.

    The ST Audio ADCIII is an STDSP24 card plus extension box. With commit
    e8a91ae18bdc ("ALSA: ice1712: Add support for STAudio ADCIII") we
    enabled the ADCIII ports using the model=staudio option but forgot
    this part to ensure the STDSP24 card is initialized properly.

    Fixes: e8a91ae18bdc ("ALSA: ice1712: Add support for STAudio ADCIII")
    Signed-off-by: Scott Bahling <sbahling@suse.com>
    Cc: <stable@vger.kernel.org>
    BugLink: https://bugzilla.suse.com/show_bug.cgi?id=1048934
    Link: https://lore.kernel.org/r/20200518175728.28766-1-tiwai@suse.de
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    sound/pci/ice1712/ice1712.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/sound/pci/ice1712/ice1712.c
    +++ b/sound/pci/ice1712/ice1712.c
    @@ -2377,7 +2377,8 @@ static int snd_ice1712_chip_init(struct
    pci_write_config_byte(ice->pci, 0x61, ice->eeprom.data[ICE_EEP1_ACLINK]);
    pci_write_config_byte(ice->pci, 0x62, ice->eeprom.data[ICE_EEP1_I2SID]);
    pci_write_config_byte(ice->pci, 0x63, ice->eeprom.data[ICE_EEP1_SPDIF]);
    - if (ice->eeprom.subvendor != ICE1712_SUBDEVICE_STDSP24) {
    + if (ice->eeprom.subvendor != ICE1712_SUBDEVICE_STDSP24 &&
    + ice->eeprom.subvendor != ICE1712_SUBDEVICE_STAUDIO_ADCIII) {
    ice->gpio.write_mask = ice->eeprom.gpiomask;
    ice->gpio.direction = ice->eeprom.gpiodir;
    snd_ice1712_write(ice, ICE1712_IREG_GPIO_WRITE_MASK,

    \
     
     \ /
      Last update: 2020-05-26 21:29    [W:4.149 / U:0.332 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site