Commit f38e6458 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v5.19-rc8' of... 

Merge tag 'asoc-fix-v5.19-rc8' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v5.19

A few more small fixes, they could all wait for the merge window if you
prefer.
parents cf33ce6f 30097967

sound/soc/codecs/lpass-va-macro.c

+9 −2
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ struct va_macro { 
	struct clk *mclk;

	struct clk *macro;

	struct clk *dcodec;

	struct clk *fsgen;

	struct clk_hw hw;

	struct lpass_macro *pds;
@@ -467,9 +468,9 @@ static int va_macro_mclk_event(struct snd_soc_dapm_widget *w, 


	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		return va_macro_mclk_enable(va, true);

		return clk_prepare_enable(va->fsgen);

	case SND_SOC_DAPM_POST_PMD:

		return va_macro_mclk_enable(va, false);

		clk_disable_unprepare(va->fsgen);

	}



	return 0;
@@ -1473,6 +1474,12 @@ static int va_macro_probe(struct platform_device *pdev) 
	if (ret)

		goto err_clkout;



	va->fsgen = clk_hw_get_clk(&va->hw, "fsgen");

	if (IS_ERR(va->fsgen)) {

		ret = PTR_ERR(va->fsgen);

		goto err_clkout;

	}



	ret = devm_snd_soc_register_component(dev, &va_macro_component_drv,

					      va_macro_dais,

					      ARRAY_SIZE(va_macro_dais));

sound/soc/codecs/max98373-i2c.c

+0 −1
Original line number Diff line number Diff line
@@ -442,7 +442,6 @@ static bool max98373_volatile_reg(struct device *dev, unsigned int reg) 
{

	switch (reg) {

	case MAX98373_R2000_SW_RESET ... MAX98373_R2009_INT_FLAG3:

	case MAX98373_R203E_AMP_PATH_GAIN:

	case MAX98373_R2054_MEAS_ADC_PVDD_CH_READBACK:

	case MAX98373_R2055_MEAS_ADC_THERM_CH_READBACK:

	case MAX98373_R20B6_BDE_CUR_STATE_READBACK:

sound/soc/sh/rcar/ssiu.c

+1 −0
Original line number Diff line number Diff line
@@ -417,6 +417,7 @@ static struct rsnd_mod_ops rsnd_ssiu_ops_gen2 = { 
	.name		= SSIU_NAME,

	.dma_req	= rsnd_ssiu_dma_req,

	.init		= rsnd_ssiu_init_gen2,

	.quit		= rsnd_ssiu_quit,

	.start		= rsnd_ssiu_start_gen2,

	.stop		= rsnd_ssiu_stop_gen2,

	.get_status	= rsnd_ssiu_get_status,