Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 38acd9b8 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/msm8916', 'asoc/fix/nau8825',... 

Merge remote-tracking branches 'asoc/fix/msm8916', 'asoc/fix/nau8825', 'asoc/fix/rt5514' and 'asoc/fix/rt5645' into asoc-linus
parents 9ebacc8c 51f493ae d070f7c7 20220945 56986b07

sound/soc/codecs/msm8916-wcd-analog.c

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ 
#define MSM8916_WCD_ANALOG_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\

			SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_48000)

#define MSM8916_WCD_ANALOG_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\

				    SNDRV_PCM_FMTBIT_S24_LE)

				    SNDRV_PCM_FMTBIT_S32_LE)



static int btn_mask = SND_JACK_BTN_0 | SND_JACK_BTN_1 |

	       SND_JACK_BTN_2 | SND_JACK_BTN_3 | SND_JACK_BTN_4;

sound/soc/codecs/msm8916-wcd-digital.c

+2 −2
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ 
				   SNDRV_PCM_RATE_32000 | \

				   SNDRV_PCM_RATE_48000)

#define MSM8916_WCD_DIGITAL_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\

				     SNDRV_PCM_FMTBIT_S24_LE)

				     SNDRV_PCM_FMTBIT_S32_LE)



struct msm8916_wcd_digital_priv {

	struct clk *ahbclk, *mclk;
@@ -645,7 +645,7 @@ static int msm8916_wcd_digital_hw_params(struct snd_pcm_substream *substream, 
				    RX_I2S_CTL_RX_I2S_MODE_MASK,

				    RX_I2S_CTL_RX_I2S_MODE_16);

		break;

	case SNDRV_PCM_FORMAT_S24_LE:

	case SNDRV_PCM_FORMAT_S32_LE:

		snd_soc_update_bits(dai->codec, LPASS_CDC_CLK_TX_I2S_CTL,

				    TX_I2S_CTL_TX_I2S_MODE_MASK,

				    TX_I2S_CTL_TX_I2S_MODE_32);

sound/soc/codecs/nau8825.c

+1 −0
Original line number Diff line number Diff line
@@ -905,6 +905,7 @@ static int nau8825_adc_event(struct snd_soc_dapm_widget *w, 


	switch (event) {

	case SND_SOC_DAPM_POST_PMU:

		msleep(125);

		regmap_update_bits(nau8825->regmap, NAU8825_REG_ENA_CTRL,

			NAU8825_ENABLE_ADC, NAU8825_ENABLE_ADC);

		break;

sound/soc/codecs/rt5514-spi.c

+9 −6
Original line number Diff line number Diff line
@@ -289,6 +289,8 @@ static int rt5514_spi_pcm_probe(struct snd_soc_platform *platform) 
			dev_err(&rt5514_spi->dev,

				"%s Failed to reguest IRQ: %d\n", __func__,

				ret);

		else

			device_init_wakeup(rt5514_dsp->dev, true);

	}



	return 0;
@@ -456,8 +458,6 @@ static int rt5514_spi_probe(struct spi_device *spi) 
		return ret;

	}



	device_init_wakeup(&spi->dev, true);



	return 0;

}
@@ -482,11 +482,14 @@ static int __maybe_unused rt5514_resume(struct device *dev) 
	if (device_may_wakeup(dev))

		disable_irq_wake(irq);



	if (rt5514_dsp) {

		if (rt5514_dsp->substream) {

		rt5514_spi_burst_read(RT5514_IRQ_CTRL, (u8 *)&buf, sizeof(buf));

			rt5514_spi_burst_read(RT5514_IRQ_CTRL, (u8 *)&buf,

				sizeof(buf));

			if (buf[0] & RT5514_IRQ_STATUS_BIT)

				rt5514_schedule_copy(rt5514_dsp);

		}

	}



	return 0;

}

sound/soc/codecs/rt5514.c

+1 −1
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ static const struct snd_soc_dapm_widget rt5514_dapm_widgets[] = { 
	SND_SOC_DAPM_PGA("DMIC1", SND_SOC_NOPM, 0, 0, NULL, 0),

	SND_SOC_DAPM_PGA("DMIC2", SND_SOC_NOPM, 0, 0, NULL, 0),



	SND_SOC_DAPM_SUPPLY("DMIC CLK", SND_SOC_NOPM, 0, 0,

	SND_SOC_DAPM_SUPPLY_S("DMIC CLK", 1, SND_SOC_NOPM, 0, 0,

		rt5514_set_dmic_clk, SND_SOC_DAPM_PRE_PMU),



	SND_SOC_DAPM_SUPPLY("ADC CLK", RT5514_CLK_CTRL1,