Commit ae558268 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-6.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "A fair amount of commits at this time due to ASoC PR merge, but all
  look small and easy, mostly device-specific fixes spanned in various
  drivers. Hopefully this should be the last big chunk for 6.1"

* tag 'sound-6.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (21 commits)
  ALSA: hda/realtek: Fix the speaker output on Samsung Galaxy Book Pro 360
  ALSA: hda/realtek: fix speakers for Samsung Galaxy Book Pro
  ALSA: usb-audio: Drop snd_BUG_ON() from snd_usbmidi_output_open()
  ASoC: stm32: dfsdm: manage cb buffers cleanup
  ASoC: sof_es8336: reduce pop noise on speaker
  ASoC: SOF: topology: No need to assign core ID if token parsing failed
  ASoC: soc-utils: Remove __exit for snd_soc_util_exit()
  ASoC: rt5677: fix legacy dai naming
  ASoC: rt5514: fix legacy dai naming
  ASoC: SOF: ipc3-topology: use old pipeline teardown flow with SOF2.1 and older
  ASoC: hda: intel-dsp-config: add ES83x6 quirk for IceLake
  ASoC: Intel: soc-acpi: add ES83x6 support to IceLake
  ASoC: tas2780: Fix set_tdm_slot in case of single slot
  ASoC: tas2764: Fix set_tdm_slot in case of single slot
  ASoC: tas2770: Fix set_tdm_slot in case of single slot
  ASoC: fsl_asrc fsl_esai fsl_sai: allow CONFIG_PM=N
  ASoC: core: Fix use-after-free in snd_soc_exit()
  MAINTAINERS: update Tzung-Bi's email address
  ASoC: Intel: bytcht_es8316: Add quirk for the Nanote UMPC-01
  ASoC: amd: yc: Add Alienware m17 R5 AMD into DMI table
  ...
parents 4ab9ffda 1abfd71e

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -416,6 +416,7 @@ TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org> 
TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>

Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>

Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>

Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>

Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Uwe Kleine-König <ukleinek@strlen.de>

Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ title: Audio codec controlled by ChromeOS EC 


maintainers:

  - Cheng-Yi Chiang <cychiang@chromium.org>

  - Tzung-Bi Shih <tzungbi@google.com>

  - Tzung-Bi Shih <tzungbi@kernel.org>



description: |

  Google's ChromeOS EC codec is a digital mic codec provided by the

Documentation/devicetree/bindings/sound/realtek,rt1015p.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Realtek rt1015p codec devicetree bindings



maintainers:

  - Tzung-Bi Shih <tzungbi@google.com>

  - Tzung-Bi Shih <tzungbi@kernel.org>



description: |

  Rt1015p is a rt1015 variant which does not support I2C and

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -4911,7 +4911,7 @@ F: drivers/platform/chrome/ 








CHROMEOS EC CODEC DRIVER









M:	Cheng-Yi Chiang <cychiang@chromium.org>









M:	Tzung-Bi Shih <tzungbi@google.com>









M:	Tzung-Bi Shih <tzungbi@kernel.org>









R:	Guenter Roeck <groeck@chromium.org>









L:	chrome-platform@lists.linux.dev









S:	Maintained
































include/sound/sof/info.h



+4
−0






























Original line number
Diff line number
Diff line







@@ -36,6 +36,10 @@ enum sof_ipc_ext_data {







	SOF_IPC_EXT_USER_ABI_INFO	= 4,









};



















/* Build u32 number in format MMmmmppp */









#define SOF_FW_VER(MAJOR, MINOR, PATCH) ((uint32_t)( \









	((MAJOR) << 24) | ((MINOR) << 12) | (PATCH)))



















/* FW version - SOF_IPC_GLB_VERSION */









struct sof_ipc_fw_version {









	struct sof_ipc_hdr hdr;