Commit 7a64bdfa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-6.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull more sound updates from Takashi Iwai:
 "For catching up the remaining stuff for 6.17: only small updates and
  the rest are mostly small fixes.

   - Fixes in HD-audio codec driver Kconfig, so that configurations can
     be more easily/safely carried between different versions

   - Fixes in ASoC SDCA, FSL xcvr, AW88399

   - ASoC IMX WM8524 support

   - HD-audio and USB-audio quirks and fixes

   - A minor selftest fix"

* tag 'sound-6.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (21 commits)
  ALSA: usb: scarlett2: Fix missing NULL check
  mips: Update HD-audio configs again
  LoongArch: Update HD-audio codec configs
  arm: Update HD-audio configs again
  selftests: ALSA: fix memory leak in utimer test
  ALSA: usb-audio: Add DSD support for Comtrue USB Audio device
  ALSA: hda/hdmi: Enable drivers as default
  ALSA: hda/cirrus: Enable drivers as default
  ALSA: hda/realtek: Enable drivers as default
  ALSA: hda/realtek - Fix mute LED for HP Victus 16-d1xxx (MB 8A26)
  ALSA: hda/realtek - Fix mute LED for HP Victus 16-s0xxx
  ALSA: hda: Fix the wrong register was used for DVC of TAS2770
  ALSA: scarlett2: Add retry on -EPROTO from scarlett2_usb_tx()
  ALSA: hda/realtek - Fix mute LED for HP Victus 16-r1xxx
  ASoC: codecs: Add acpi_match_table for aw88399 driver
  ASoC: dt-bindings: atmel,at91-ssc: add microchip,sam9x7-ssc
  ASoC: imx-card: Add WM8524 support
  ASoC: fsl_xcvr: get channel status data with firmware exists
  ASoC: fsl_xcvr: get channel status data when PHY is not exists
  ASoC: SDCA: Add support for -cn- value properties
  ...
parents 6fac1139 df485a4b

Documentation/devicetree/bindings/sound/atmel,at91-ssc.yaml

+8 −3
Original line number Diff line number Diff line
@@ -16,9 +16,14 @@ description: 


properties:

  compatible:

    enum:

    oneOf:

      - enum:

          - atmel,at91rm9200-ssc

          - atmel,at91sam9g45-ssc

      - items:

          - enum:

              - microchip,sam9x7-ssc

          - const: atmel,at91sam9g45-ssc



  reg:

    maxItems: 1

arch/arm/configs/multi_v7_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -794,10 +794,12 @@ CONFIG_SND=m 
CONFIG_SND_HDA_TEGRA=m

CONFIG_SND_HDA_INPUT_BEEP=y

CONFIG_SND_HDA_PATCH_LOADER=y

CONFIG_SND_HDA_CODEC_REALTEK=y

CONFIG_SND_HDA_CODEC_REALTEK=m

CONFIG_SND_HDA_CODEC_REALTEK_LIB=m

CONFIG_SND_HDA_CODEC_ALC269=m

CONFIG_SND_HDA_CODEC_HDMI=m

CONFIG_SND_HDA_CODEC_HDMI_GENERIC=m

CONFIG_SND_HDA_CODEC_HDMI_NVIDIA=m

CONFIG_SND_HDA_CODEC_HDMI_TEGRA=m

CONFIG_SND_USB_AUDIO=m

CONFIG_SND_SOC=m

arch/arm/configs/tegra_defconfig

+5 −0
Original line number Diff line number Diff line
@@ -225,7 +225,12 @@ CONFIG_SND_HDA_TEGRA=y 
CONFIG_SND_HDA_INPUT_BEEP=y

CONFIG_SND_HDA_PATCH_LOADER=y

CONFIG_SND_HDA_CODEC_REALTEK=y

CONFIG_SND_HDA_CODEC_REALTEK_LIB=y

CONFIG_SND_HDA_CODEC_ALC269=y

CONFIG_SND_HDA_CODEC_HDMI=y

CONFIG_SND_HDA_CODEC_HDMI_GENERIC=y

CONFIG_SND_HDA_CODEC_HDMI_NVIDIA=y

CONFIG_SND_HDA_CODEC_HDMI_TEGRA=y

# CONFIG_SND_ARM is not set

# CONFIG_SND_SPI is not set

# CONFIG_SND_USB is not set

arch/loongarch/configs/loongson3_defconfig

+15 −0
Original line number Diff line number Diff line
@@ -783,8 +783,23 @@ CONFIG_SND_HDA_HWDEP=y 
CONFIG_SND_HDA_INPUT_BEEP=y

CONFIG_SND_HDA_PATCH_LOADER=y

CONFIG_SND_HDA_CODEC_REALTEK=y

CONFIG_SND_HDA_CODEC_REALTEK_LIB=y

CONFIG_SND_HDA_CODEC_ALC260=y

CONFIG_SND_HDA_CODEC_ALC262=y

CONFIG_SND_HDA_CODEC_ALC268=y

CONFIG_SND_HDA_CODEC_ALC269=y

CONFIG_SND_HDA_CODEC_ALC662=y

CONFIG_SND_HDA_CODEC_ALC680=y

CONFIG_SND_HDA_CODEC_ALC861=y

CONFIG_SND_HDA_CODEC_ALC861VD=y

CONFIG_SND_HDA_CODEC_ALC880=y

CONFIG_SND_HDA_CODEC_ALC882=y

CONFIG_SND_HDA_CODEC_SIGMATEL=y

CONFIG_SND_HDA_CODEC_HDMI=y

CONFIG_SND_HDA_CODEC_HDMI_GENERIC=y

CONFIG_SND_HDA_CODEC_HDMI_INTEL=y

CONFIG_SND_HDA_CODEC_HDMI_ATI=y

CONFIG_SND_HDA_CODEC_HDMI_NVIDIA=y

CONFIG_SND_HDA_CODEC_CONEXANT=y

CONFIG_SND_USB_AUDIO=m

CONFIG_SND_SOC=m

arch/mips/configs/loongson2k_defconfig

+11 −0
Original line number Diff line number Diff line
@@ -256,6 +256,17 @@ CONFIG_SND_HDA_INTEL=y 
CONFIG_SND_HDA_HWDEP=y

CONFIG_SND_HDA_PATCH_LOADER=y

CONFIG_SND_HDA_CODEC_REALTEK=y

CONFIG_SND_HDA_CODEC_REALTEK_LIB=y

CONFIG_SND_HDA_CODEC_ALC260=y

CONFIG_SND_HDA_CODEC_ALC262=y

CONFIG_SND_HDA_CODEC_ALC268=y

CONFIG_SND_HDA_CODEC_ALC269=y

CONFIG_SND_HDA_CODEC_ALC662=y

CONFIG_SND_HDA_CODEC_ALC680=y

CONFIG_SND_HDA_CODEC_ALC861=y

CONFIG_SND_HDA_CODEC_ALC861VD=y

CONFIG_SND_HDA_CODEC_ALC880=y

CONFIG_SND_HDA_CODEC_ALC882=y

CONFIG_SND_HDA_CODEC_ANALOG=y

CONFIG_SND_HDA_CODEC_SIGMATEL=y

CONFIG_SND_HDA_CODEC_VIA=y