Commit 4a224885 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.4-rc1' of... 

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

ASoC: Fixes for v6.4

A small set of fixes and device quirks that have come in during the
merge window, the Qualcomm fix seems quite large but it's mainly code
motion so looks larger than it is.
parents 0d727e18 ec6f82b4

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

+14 −0
Original line number Diff line number Diff line
@@ -227,6 +227,20 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "M5402RA"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

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

			DMI_MATCH(DMI_PRODUCT_NAME, "M6400RC"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

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

			DMI_MATCH(DMI_PRODUCT_NAME, "M3402RA"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

sound/soc/codecs/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1090,7 +1090,7 @@ config SND_SOC_MAX98088 
	depends on I2C



config SND_SOC_MAX98090

	tristate

	tristate "Maxim MAX98090 CODEC"

	depends on I2C



config SND_SOC_MAX98095

sound/soc/codecs/wcd938x-sdw.c

+1025 −12

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/wcd938x.c

+4 −999

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/wcd938x.h

+1 −0
Original line number Diff line number Diff line
@@ -663,6 +663,7 @@ struct wcd938x_sdw_priv { 
	bool is_tx;

	struct wcd938x_priv *wcd938x;

	struct irq_domain *slave_irq;

	struct regmap *regmap;

};



#if IS_ENABLED(CONFIG_SND_SOC_WCD938X_SDW)