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

drivers/spi/spi-lantiq-ssc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -899,7 +899,7 @@ static int lantiq_ssc_probe(struct platform_device *pdev)
		master->bits_per_word_mask = SPI_BPW_RANGE_MASK(2, 8) \|
		SPI_BPW_MASK(16) \| SPI_BPW_MASK(32);

		spi->wq = alloc_ordered_workqueue(dev_name(dev), 0);
		spi->wq = alloc_ordered_workqueue(dev_name(dev), WQ_MEM_RECLAIM);
		if (!spi->wq) {
		err = -ENOMEM;
		goto err_clk_put;

sound/soc/codecs/max98357a.c

+40 −10

Original line number	Diff line number	Diff line
		@@ -23,36 +23,61 @@
		struct max98357a_priv {
		struct gpio_desc *sdmode;
		unsigned int sdmode_delay;
		int sdmode_switch;
		};

		static int max98357a_sdmode_event(struct snd_soc_dapm_widget *w,
		struct snd_kcontrol *kcontrol, int event)
		static int max98357a_daiops_trigger(struct snd_pcm_substream *substream,
		int cmd, struct snd_soc_dai *dai)
		{
		struct snd_soc_component *component =
		snd_soc_dapm_to_component(w->dapm);
		struct snd_soc_component *component = dai->component;
		struct max98357a_priv *max98357a =
		snd_soc_component_get_drvdata(component);

		if (!max98357a->sdmode)
		return 0;

		if (event & SND_SOC_DAPM_POST_PMU) {
		msleep(max98357a->sdmode_delay);
		switch (cmd) {
		case SNDRV_PCM_TRIGGER_START:
		case SNDRV_PCM_TRIGGER_RESUME:
		case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
		mdelay(max98357a->sdmode_delay);
		if (max98357a->sdmode_switch) {
		gpiod_set_value(max98357a->sdmode, 1);
		dev_dbg(component->dev, "set sdmode to 1");
		} else if (event & SND_SOC_DAPM_PRE_PMD) {
		}
		break;
		case SNDRV_PCM_TRIGGER_STOP:
		case SNDRV_PCM_TRIGGER_SUSPEND:
		case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
		gpiod_set_value(max98357a->sdmode, 0);
		dev_dbg(component->dev, "set sdmode to 0");
		break;
		}

		return 0;
		}

		static int max98357a_sdmode_event(struct snd_soc_dapm_widget *w,
		struct snd_kcontrol *kcontrol, int event)
		{
		struct snd_soc_component *component =
		snd_soc_dapm_to_component(w->dapm);
		struct max98357a_priv *max98357a =
		snd_soc_component_get_drvdata(component);

		if (event & SND_SOC_DAPM_POST_PMU)
		max98357a->sdmode_switch = 1;
		else if (event & SND_SOC_DAPM_POST_PMD)
		max98357a->sdmode_switch = 0;

		return 0;
		}

		static const struct snd_soc_dapm_widget max98357a_dapm_widgets[] = {
		SND_SOC_DAPM_OUTPUT("Speaker"),
		SND_SOC_DAPM_OUT_DRV_E("SD_MODE", SND_SOC_NOPM, 0, 0, NULL, 0,
		max98357a_sdmode_event,
		SND_SOC_DAPM_POST_PMU \| SND_SOC_DAPM_PRE_PMD),
		SND_SOC_DAPM_POST_PMU \| SND_SOC_DAPM_POST_PMD),
		};

		static const struct snd_soc_dapm_route max98357a_dapm_routes[] = {
		@@ -71,6 +96,10 @@ static const struct snd_soc_component_driver max98357a_component_driver = {
		.non_legacy_dai_naming = 1,
		};

		static const struct snd_soc_dai_ops max98357a_dai_ops = {
		.trigger = max98357a_daiops_trigger,
		};

		static struct snd_soc_dai_driver max98357a_dai_driver = {
		.name = "HiFi",
		.playback = {
		@@ -90,6 +119,7 @@ static struct snd_soc_dai_driver max98357a_dai_driver = {
		.channels_min = 1,
		.channels_max = 2,
		},
		.ops = &max98357a_dai_ops,
		};

		static int max98357a_platform_probe(struct platform_device *pdev)

sound/soc/codecs/max98390.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -678,7 +678,7 @@ static const struct snd_kcontrol_new max98390_dai_controls =

		static const struct snd_soc_dapm_widget max98390_dapm_widgets[] = {
		SND_SOC_DAPM_DAC_E("Amp Enable", "HiFi Playback",
		MAX98390_R203A_AMP_EN, 0, 0, max98390_dac_event,
		SND_SOC_NOPM, 0, 0, max98390_dac_event,
		SND_SOC_DAPM_POST_PMU \| SND_SOC_DAPM_POST_PMD),
		SND_SOC_DAPM_MUX("DAI Sel Mux", SND_SOC_NOPM, 0, 0,
		&max98390_dai_controls),

sound/soc/fsl/fsl_sai.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -680,10 +680,11 @@ static int fsl_sai_dai_probe(struct snd_soc_dai *cpu_dai)
		regmap_write(sai->regmap, FSL_SAI_RCSR(ofs), 0);

		regmap_update_bits(sai->regmap, FSL_SAI_TCR1(ofs),
		FSL_SAI_CR1_RFW_MASK,
		FSL_SAI_CR1_RFW_MASK(sai->soc_data->fifo_depth),
		sai->soc_data->fifo_depth - FSL_SAI_MAXBURST_TX);
		regmap_update_bits(sai->regmap, FSL_SAI_RCR1(ofs),
		FSL_SAI_CR1_RFW_MASK, FSL_SAI_MAXBURST_RX - 1);
		FSL_SAI_CR1_RFW_MASK(sai->soc_data->fifo_depth),
		FSL_SAI_MAXBURST_RX - 1);

		snd_soc_dai_init_dma_data(cpu_dai, &sai->dma_params_tx,
		&sai->dma_params_rx);

sound/soc/fsl/fsl_sai.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,7 @@
		#define FSL_SAI_CSR_FRDE BIT(0)

		/* SAI Transmit and Receive Configuration 1 Register */
		#define FSL_SAI_CR1_RFW_MASK 0x1f
		#define FSL_SAI_CR1_RFW_MASK(x) ((x) - 1)

		/* SAI Transmit and Receive Configuration 2 Register */
		#define FSL_SAI_CR2_SYNC BIT(30)

Admin message