Merge remote-tracking branch 'asoc/for-5.7' into asoc-linus (a72ff08f) · Commits · 戴 / test

Documentation/devicetree/bindings/sound/nau8825.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -101,5 +101,5 @@ Example:
		nuvoton,crosstalk-enable;

		clock-names = "mclk";
		clocks = <&tegra_car TEGRA210_CLK_CLK_OUT_2>;
		clocks = <&tegra_pmc TEGRA_PMC_CLK_OUT_2>;
		};

Documentation/devicetree/bindings/sound/rt1308.txt

100755 → 100644

+0 −0

File mode changed from 100755 to 100644.

View file

include/sound/soc.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -790,9 +790,6 @@ struct snd_soc_dai_link {
		const struct snd_soc_pcm_stream *params;
		unsigned int num_params;

		struct snd_soc_dapm_widget *playback_widget;
		struct snd_soc_dapm_widget *capture_widget;

		unsigned int dai_fmt; /* format to set on init */

		enum snd_soc_dpcm_trigger trigger[2]; /* trigger type for DPCM */
		@@ -1156,6 +1153,9 @@ struct snd_soc_pcm_runtime {
		struct snd_soc_dai **cpu_dais;
		unsigned int num_cpus;

		struct snd_soc_dapm_widget *playback_widget;
		struct snd_soc_dapm_widget *capture_widget;

		struct delayed_work delayed_work;
		void (close_delayed_work_func)(struct snd_soc_pcm_runtime rtd);
		#ifdef CONFIG_DEBUG_FS

sound/soc/amd/raven/acp3x-pcm-dma.c

+24 −13

Original line number	Diff line number	Diff line
		@@ -241,14 +241,6 @@ static int acp3x_dma_open(struct snd_soc_component *component,
		adata->i2ssp_play_stream && !adata->i2ssp_capture_stream)
		rv_writel(1, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB);

		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
		adata->play_stream = substream;
		adata->i2ssp_play_stream = substream;
		} else {
		adata->capture_stream = substream;
		adata->i2ssp_capture_stream = substream;
		}

		i2s_data->acp3x_base = adata->acp3x_base;
		runtime->private_data = i2s_data;
		return ret;
		@@ -263,23 +255,42 @@ static int acp3x_dma_hw_params(struct snd_soc_component *component,
		struct snd_soc_pcm_runtime *prtd;
		struct snd_soc_card *card;
		struct acp3x_platform_info *pinfo;
		struct i2s_dev_data *adata;
		u64 size;

		prtd = substream->private_data;
		card = prtd->card;
		pinfo = snd_soc_card_get_drvdata(card);
		adata = dev_get_drvdata(component->dev);
		rtd = substream->runtime->private_data;
		if (!rtd)
		return -EINVAL;

		if (pinfo)
		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
		if (pinfo) {
		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
		rtd->i2s_instance = pinfo->play_i2s_instance;
		else
		switch (rtd->i2s_instance) {
		case I2S_BT_INSTANCE:
		adata->play_stream = substream;
		break;
		case I2S_SP_INSTANCE:
		default:
		adata->i2ssp_play_stream = substream;
		}
		} else {
		rtd->i2s_instance = pinfo->cap_i2s_instance;
		else
		switch (rtd->i2s_instance) {
		case I2S_BT_INSTANCE:
		adata->capture_stream = substream;
		break;
		case I2S_SP_INSTANCE:
		default:
		adata->i2ssp_capture_stream = substream;
		}
		}
		} else {
		pr_err("pinfo failed\n");

		}
		size = params_buffer_bytes(params);
		rtd->dma_addr = substream->dma_buffer.addr;
		rtd->num_pages = (PAGE_ALIGN(size) >> PAGE_SHIFT);

sound/soc/codecs/adau7118-i2c.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,12 @@ static const struct reg_default adau7118_reg_defaults[] = {
		{ ADAU7118_REG_RESET, 0x00 },
		};

		static bool adau7118_volatile(struct device *dev, unsigned int reg)
		{
		return (reg == ADAU7118_REG_RESET);
		}


		static const struct regmap_config adau7118_regmap_config = {
		.reg_bits = 8,
		.val_bits = 8,
		@@ -39,6 +45,7 @@ static const struct regmap_config adau7118_regmap_config = {
		.num_reg_defaults = ARRAY_SIZE(adau7118_reg_defaults),
		.cache_type = REGCACHE_RBTREE,
		.max_register = ADAU7118_REG_RESET,
		.volatile_reg = adau7118_volatile,
		};

		static int adau7118_probe_i2c(struct i2c_client *i2c,

Admin message