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

Merge tag 'asoc-fix-v6.2-rc5' of... 

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

ASoC: Fixes for v6.2

An unfortunately large batch of fixes here, the numbers amplified
by several repeated fixes for patterns of bugs in multiple
drivers.  Most of this is in the x86 drivers which are very
actively developed, the implementation of PCI shutdown is a fix
for issues with spamming warnings into the logs with a leaked
reference to the i915 driver.
parents 53466ebd e18c6da6

drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c

+1 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ static int snd_dw_hdmi_probe(struct platform_device *pdev) 
	struct hdmi_codec_pdata pdata;

	struct platform_device *platform;



	memset(&pdata, 0, sizeof(pdata));

	pdata.ops		= &dw_hdmi_i2s_ops;

	pdata.i2s		= 1;

	pdata.max_i2s_channels	= 8;

sound/soc/amd/acp-es8336.c

+4 −2
Original line number Diff line number Diff line
@@ -198,9 +198,11 @@ static int st_es8336_late_probe(struct snd_soc_card *card) 
	int ret;



	adev = acpi_dev_get_first_match_dev("ESSX8336", NULL, -1);

	if (adev)

		put_device(&adev->dev);

	if (!adev)

		return -ENODEV;



	codec_dev = acpi_get_first_physical_node(adev);

	acpi_dev_put(adev);

	if (!codec_dev)

		dev_err(card->dev, "can not find codec dev\n");

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

+21 −0
Original line number Diff line number Diff line
@@ -227,6 +227,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "Redmi Book Pro 14 2022"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "TIMI"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Redmi Book Pro 15 2022"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {
@@ -234,6 +241,20 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "Blade 14 (2022) - RZ09-0427"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "RB"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Swift SFA16-41"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "IRBIS"),

			DMI_MATCH(DMI_PRODUCT_NAME, "15NBC1011"),

		}

	},

	{}

};

sound/soc/codecs/cs42l56.c

+0 −6
Original line number Diff line number Diff line
@@ -1191,18 +1191,12 @@ static int cs42l56_i2c_probe(struct i2c_client *i2c_client) 
	if (pdata) {

		cs42l56->pdata = *pdata;

	} else {

		pdata = devm_kzalloc(&i2c_client->dev, sizeof(*pdata),

				     GFP_KERNEL);

		if (!pdata)

			return -ENOMEM;



		if (i2c_client->dev.of_node) {

			ret = cs42l56_handle_of_data(i2c_client,

						     &cs42l56->pdata);

			if (ret != 0)

				return ret;

		}

		cs42l56->pdata = *pdata;

	}



	if (cs42l56->pdata.gpio_nreset) {

sound/soc/codecs/wsa883x.c

+2 −2
Original line number Diff line number Diff line
@@ -1359,8 +1359,8 @@ static struct snd_soc_dai_driver wsa883x_dais[] = { 
			.stream_name = "SPKR Playback",

			.rates = WSA883X_RATES | WSA883X_FRAC_RATES,

			.formats = WSA883X_FORMATS,

			.rate_max = 8000,

			.rate_min = 352800,

			.rate_min = 8000,

			.rate_max = 352800,

			.channels_min = 1,

			.channels_max = 1,

		},