Commit a4a6eed8 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.5-rc7' of... 

Merge tag 'asoc-fix-v6.5-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v6.5

A relatively large but generally not super urgent set of fixes for ASoC,
including some quirks and a MAINTAINERS update.  There's also an update
to cs35l56 to change the firmware ABI, there are no current shipping
systems which use the current interface and the sooner we get the new
interface in the less likely it is that something will start.

It'd be nice if these landed for v6.5 but not the end of the world if
they wait till v6.6.
parents 1d0eb614 1613781d

MAINTAINERS

+33 −0
Original line number Diff line number Diff line
@@ -21063,6 +21063,39 @@ S: Maintained 
F:	Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml

F:	sound/soc/ti/









TEXAS INSTRUMENTS AUDIO (ASoC/HDA) DRIVERS









M:	Shenghao Ding <shenghao-ding@ti.com>









M:	Kevin Lu <kevin-lu@ti.com>









M:	Baojun Xu <x1077012@ti.com>









L:	alsa-devel@alsa-project.org (moderated for non-subscribers)









S:	Maintained









F:	Documentation/devicetree/bindings/sound/tas2552.txt









F:	Documentation/devicetree/bindings/sound/tas2562.yaml









F:	Documentation/devicetree/bindings/sound/tas2770.yaml









F:	Documentation/devicetree/bindings/sound/tas27xx.yaml









F:	Documentation/devicetree/bindings/sound/ti,pcm1681.txt









F:	Documentation/devicetree/bindings/sound/ti,pcm3168a.yaml









F:	Documentation/devicetree/bindings/sound/ti,tlv320*.yaml









F:	Documentation/devicetree/bindings/sound/tlv320adcx140.yaml









F:	Documentation/devicetree/bindings/sound/tlv320aic31xx.txt









F:	Documentation/devicetree/bindings/sound/tpa6130a2.txt









F:	include/sound/tas2*.h









F:	include/sound/tlv320*.h









F:	include/sound/tpa6130a2-plat.h









F:	sound/pci/hda/tas2781_hda_i2c.c









F:	sound/soc/codecs/pcm1681.c









F:	sound/soc/codecs/pcm1789*.*









F:	sound/soc/codecs/pcm179x*.*









F:	sound/soc/codecs/pcm186x*.*









F:	sound/soc/codecs/pcm3008.*









F:	sound/soc/codecs/pcm3060*.*









F:	sound/soc/codecs/pcm3168a*.*









F:	sound/soc/codecs/pcm5102a.c









F:	sound/soc/codecs/pcm512x*.*









F:	sound/soc/codecs/tas2*.*









F:	sound/soc/codecs/tlv320*.*









F:	sound/soc/codecs/tpa6130a2.*

















TEXAS INSTRUMENTS DMA DRIVERS









M:	Peter Ujfalusi <peter.ujfalusi@gmail.com>









L:	dmaengine@vger.kernel.org

























sound/soc/amd/yc/acp6x-mach.c



+7
−0






























Original line number
Diff line number
Diff line







@@ -248,6 +248,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = {







			DMI_MATCH(DMI_PRODUCT_NAME, "M3402RA"),









		}









	},









	{









		.driver_data = &acp6x_card,









		.matches = {









			DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK COMPUTER INC."),









			DMI_MATCH(DMI_PRODUCT_NAME, "M6500RC"),









		}









	},









	{









		.driver_data = &acp6x_card,









		.matches = {
































sound/soc/codecs/cs35l41.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -168,7 +168,7 @@ static int cs35l41_get_fs_mon_config_index(int freq)







static const DECLARE_TLV_DB_RANGE(dig_vol_tlv,









		0, 0, TLV_DB_SCALE_ITEM(TLV_DB_GAIN_MUTE, 0, 1),









		1, 913, TLV_DB_MINMAX_ITEM(-10200, 1200));









static DECLARE_TLV_DB_SCALE(amp_gain_tlv, 0, 1, 1);









static DECLARE_TLV_DB_SCALE(amp_gain_tlv, 50, 100, 0);



















static const struct snd_kcontrol_new dre_ctrl =









	SOC_DAPM_SINGLE("Switch", CS35L41_PWR_CTRL3, 20, 1, 0);
































sound/soc/codecs/cs35l56-i2c.c



+9
−0






























Original line number
Diff line number
Diff line







@@ -62,10 +62,19 @@ static const struct i2c_device_id cs35l56_id_i2c[] = {







};









MODULE_DEVICE_TABLE(i2c, cs35l56_id_i2c);



















#ifdef CONFIG_ACPI









static const struct acpi_device_id cs35l56_asoc_acpi_match[] = {









	{ "CSC355C", 0 },









	{},









};









MODULE_DEVICE_TABLE(acpi, cs35l56_asoc_acpi_match);









#endif



















static struct i2c_driver cs35l56_i2c_driver = {









	.driver = {









		.name		= "cs35l56",









		.pm = &cs35l56_pm_ops_i2c_spi,









		.acpi_match_table = ACPI_PTR(cs35l56_asoc_acpi_match),









	},









	.id_table	= cs35l56_id_i2c,









	.probe		= cs35l56_i2c_probe,
































sound/soc/codecs/cs35l56-spi.c



+9
−0






























Original line number
Diff line number
Diff line







@@ -59,10 +59,19 @@ static const struct spi_device_id cs35l56_id_spi[] = {







};









MODULE_DEVICE_TABLE(spi, cs35l56_id_spi);



















#ifdef CONFIG_ACPI









static const struct acpi_device_id cs35l56_asoc_acpi_match[] = {









	{ "CSC355C", 0 },









	{},









};









MODULE_DEVICE_TABLE(acpi, cs35l56_asoc_acpi_match);









#endif



















static struct spi_driver cs35l56_spi_driver = {









	.driver = {









		.name		= "cs35l56",









		.pm = &cs35l56_pm_ops_i2c_spi,









		.acpi_match_table = ACPI_PTR(cs35l56_asoc_acpi_match),









	},









	.id_table	= cs35l56_id_spi,









	.probe		= cs35l56_spi_probe,