Mark Brown 6195eb15f6 Merge series "Multiple headphone codec driver support" from Brent Lu <brent.lu@intel.com>: ... Support multiple headphone drivers in same machine driver. In this case, both rt5682 and rt5682s are supported and enumerated by different ACPI HID "10EC5682" and "RTL5682". V2 Changes: - remove useless 'NULL', 'false' in if-condition - can use 'comp_ids' field alone to enumerate driver - add comma to the end of entry in structure initialization - keep the table of byt/cht/cml/icl untouched V3 Changes: - upstreamd from SOF github, PR#3200 - use new compatiable IDs to shrink the enumerate table of BYT and CHT - add 'const' to snd_soc_acpi_codecs structures V4 Changes: - add signoff to patch 4~6 V5 Changes: - none, just rebase for patch 3 conflict Brent Lu (3): ASoC: soc-acpi: add comp_ids field for machine driver matching ASoC: Intel: sof_rt5682: detect codec variant in probe function ASoC: Intel: sof_rt5682: use comp_ids to enumerate rt5682s Pierre-Louis Bossart (3): ASoC: Intel: soc-acpi-byt: shrink tables using compatible IDs ASoC: Intel: soc-acpi-cht: shrink tables using compatible IDs ASoC: Intel: soc-acpi: use const for all uses of snd_soc_acpi_codecs include/sound/soc-acpi.h | 3 + sound/soc/intel/boards/sof_rt5682.c | 34 ++------- .../intel/common/soc-acpi-intel-adl-match.c | 11 ++- .../intel/common/soc-acpi-intel-bxt-match.c | 2 +- .../intel/common/soc-acpi-intel-byt-match.c | 68 +++++++----------- .../intel/common/soc-acpi-intel-cht-match.c | 69 +++++++------------ .../intel/common/soc-acpi-intel-cml-match.c | 8 +-- .../intel/common/soc-acpi-intel-glk-match.c | 2 +- .../intel/common/soc-acpi-intel-jsl-match.c | 43 ++++-------- .../intel/common/soc-acpi-intel-kbl-match.c | 12 ++-- .../intel/common/soc-acpi-intel-skl-match.c | 2 +- .../intel/common/soc-acpi-intel-tgl-match.c | 11 ++- sound/soc/soc-acpi.c | 24 ++++++- 13 files changed, 119 insertions(+), 170 deletions(-) -- 2.25.1		2021-10-29 21:53:41 +01:00
..
ac97	bus: Make remove callback return void	2021-07-21 11:53:42 +02:00
aoa	Kbuild updates for v5.15	2021-09-03 15:33:47 -07:00
arm	ALSA: pxa2xx: Use managed PCM buffer allocation	2021-08-04 08:08:21 +02:00
atmel
core	ALSA: pcm: Workaround for a wrong offset in SYNC_PTR compat ioctl	2021-10-11 18:10:47 +02:00
drivers	ALSA: pcsp: Make hrtimer forwarding more robust	2021-09-28 10:58:08 +02:00
firewire	ALSA: firewire-motu: fix truncated bytes in message tracepoints	2021-09-21 18:48:32 +02:00
hda	Linux 5.15-rc6	2021-10-18 13:50:42 +01:00
i2c	ALSA: i2c: tea6330t: Remove redundant initialization of variable err	2021-06-12 09:32:14 +02:00
isa	ALSA: gus: Fix repeated probe for ISA interwave card	2021-09-07 11:40:08 +02:00
mips	ALSA: n64: check return value after calling platform_get_resource()	2021-06-12 09:31:13 +02:00
oss	sound/oss/dmasound: Remove superfluous "break"	2021-05-27 08:24:23 +02:00
parisc	parisc architecture updates for kernel 5.15:	2021-09-02 13:16:00 -07:00
pci	ALSA: hda/realtek: Fix the mic type detection issue for ASUS G551JW	2021-10-12 14:10:19 +02:00
pcmcia	ALSA: vx: Manage vx_core object with devres	2021-07-19 16:17:09 +02:00
ppc	ALSA: ppc: fix error return code in snd_pmac_probe()	2021-06-16 08:52:29 +02:00
sh
soc	Merge series "Multiple headphone codec driver support" from Brent Lu <brent.lu@intel.com>:	2021-10-29 21:53:41 +01:00
sparc	ALSA: sparc: Fix assignment in if condition	2021-06-09 17:30:29 +02:00
spi
synth	ALSA: emux: fix spelling mistakes	2021-07-05 19:34:22 +02:00
usb	ALSA: usb-audio: Add quirk for VF0770	2021-10-12 22:13:11 +02:00
virtio
x86	ALSA: memalloc: Correctly name as WC	2021-08-04 08:07:58 +02:00
xen
ac97_bus.c
Kconfig
last.c
Makefile
sound_core.c