ASoC: Merge up fixes (07db6d5e) · Commits · git / linux-net

Documentation/devicetree/bindings/sound/rockchip,rk3308-codec.yaml

+4 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,10 @@ properties:
		- const: mclk_rx
		- const: hclk

		port:
		$ref: audio-graph-port.yaml#
		unevaluatedProperties: false

		resets:
		maxItems: 1

+10 −1

Original line number	Diff line number	Diff line
		@@ -21720,6 +21720,15 @@ S: Supported
		W: https://github.com/thesofproject/linux/
		F: sound/soc/sof/

		SOUND - GENERIC SOUND CARD (Simple-Audio-Card, Audio-Graph-Card)
		M: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
		S: Supported
		L: linux-sound@vger.kernel.org
		F: sound/soc/generic/
		F: include/sound/simple_card*
		F: Documentation/devicetree/bindings/sound/simple-card.yaml
		F: Documentation/devicetree/bindings/sound/audio-graph*.yaml

		SOUNDWIRE SUBSYSTEM
		M: Vinod Koul <vkoul@kernel.org>
		M: Bard Liao <yung-chuan.liao@linux.intel.com>
		@@ -23313,7 +23322,7 @@ F: Documentation/devicetree/bindings/iio/adc/ti,lmp92064.yaml
		F: drivers/iio/adc/ti-lmp92064.c

		TI PCM3060 ASoC CODEC DRIVER
		M: Kirill Marinushkin <kmarinushkin@birdec.com>
		M: Kirill Marinushkin <k.marinushkin@gmail.com>
		L: linux-sound@vger.kernel.org
		S: Maintained
		F: Documentation/devicetree/bindings/sound/pcm3060.txt

+6 −13

Original line number	Diff line number	Diff line
		@@ -383,11 +383,12 @@ static int intel_hw_params(struct snd_pcm_substream *substream,
		static int intel_prepare(struct snd_pcm_substream *substream,
		struct snd_soc_dai *dai)
		{
		struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
		struct sdw_cdns *cdns = snd_soc_dai_get_drvdata(dai);
		struct sdw_intel *sdw = cdns_to_intel(cdns);
		struct sdw_cdns_dai_runtime *dai_runtime;
		struct snd_pcm_hw_params *hw_params;
		int ch, dir;
		int ret = 0;

		dai_runtime = cdns->dai_runtime_array[dai->id];
		if (!dai_runtime) {
		@@ -396,12 +397,8 @@ static int intel_prepare(struct snd_pcm_substream *substream,
		return -EIO;
		}

		if (dai_runtime->suspended) {
		struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
		struct snd_pcm_hw_params *hw_params;

		hw_params = &rtd->dpcm[substream->stream].hw_params;

		if (dai_runtime->suspended) {
		dai_runtime->suspended = false;

		/*
		@@ -422,17 +419,13 @@ static int intel_prepare(struct snd_pcm_substream *substream,
		/* the SHIM will be configured in the callback functions */

		sdw_cdns_config_stream(cdns, ch, dir, dai_runtime->pdi);
		}

		/* Inform DSP about PDI stream number */
		ret = intel_params_stream(sdw, substream, dai,
		hw_params,
		sdw->instance,
		return intel_params_stream(sdw, substream, dai, hw_params, sdw->instance,
		dai_runtime->pdi->intel_alh_id);
		}

		return ret;
		}

		static int
		intel_hw_free(struct snd_pcm_substream substream, struct snd_soc_dai dai)
		{

+4 −0

Original line number	Diff line number	Diff line
		@@ -721,6 +721,10 @@ static const struct config_entry acpi_config_table[] = {
		#if IS_ENABLED(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI) \|\| \
		IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
		/* BayTrail */
		{
		.flags = FLAG_SST_OR_SOF_BYT,
		.acpi_hid = "LPE0F28",
		},
		{
		.flags = FLAG_SST_OR_SOF_BYT,
		.acpi_hid = "80860F28",

+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, "21M3"),
		}
		},
		{
		.driver_data = &acp6x_card,
		.matches = {
		DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
		DMI_MATCH(DMI_PRODUCT_NAME, "21M4"),
		}
		},
		{
		.driver_data = &acp6x_card,
		.matches = {
		@@ -325,6 +332,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = {
		DMI_MATCH(DMI_PRODUCT_NAME, "M6500RC"),
		}
		},
		{
		.driver_data = &acp6x_card,
		.matches = {
		DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK COMPUTER INC."),
		DMI_MATCH(DMI_PRODUCT_NAME, "E1404FA"),
		}
		},
		{
		.driver_data = &acp6x_card,
		.matches = {
		@@ -388,6 +402,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = {
		DMI_MATCH(DMI_PRODUCT_NAME, "Redmi Book Pro 15 2022"),
		}
		},
		{
		.driver_data = &acp6x_card,
		.matches = {
		DMI_MATCH(DMI_BOARD_VENDOR, "TIMI"),
		DMI_MATCH(DMI_PRODUCT_NAME, "Xiaomi Book Pro 14 2022"),
		}
		},
		{
		.driver_data = &acp6x_card,
		.matches = {