Commit 9c319577 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v5.12-rc6' of... 

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

ASoC: Fixes for v5.12

A fairly small batch of driver specific fixes, mainly for various x86
systems with the biggest set being fixes to power down DSPs properly on
x86 SOF systems.
parents 168632a4 e7a48c71

sound/soc/bcm/cygnus-ssp.c

+3 −1
Original line number Diff line number Diff line
@@ -1348,8 +1348,10 @@ static int cygnus_ssp_probe(struct platform_device *pdev) 
					&cygnus_ssp_dai[active_port_count]);



		/* negative is err, 0 is active and good, 1 is disabled */

		if (err < 0)

		if (err < 0) {

			of_node_put(child_node);

			return err;

		}

		else if (!err) {

			dev_dbg(dev, "Activating DAI: %s\n",

				cygnus_ssp_dai[active_port_count].name);

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

+1 −1
Original line number Diff line number Diff line
@@ -3551,7 +3551,7 @@ static int rx_macro_probe(struct platform_device *pdev) 


	/* set MCLK and NPL rates */

	clk_set_rate(rx->clks[2].clk, MCLK_FREQ);

	clk_set_rate(rx->clks[3].clk, MCLK_FREQ);

	clk_set_rate(rx->clks[3].clk, 2 * MCLK_FREQ);



	ret = clk_bulk_prepare_enable(RX_NUM_CLKS_MAX, rx->clks);

	if (ret)

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

+1 −1
Original line number Diff line number Diff line
@@ -1811,7 +1811,7 @@ static int tx_macro_probe(struct platform_device *pdev) 


	/* set MCLK and NPL rates */

	clk_set_rate(tx->clks[2].clk, MCLK_FREQ);

	clk_set_rate(tx->clks[3].clk, MCLK_FREQ);

	clk_set_rate(tx->clks[3].clk, 2 * MCLK_FREQ);



	ret = clk_bulk_prepare_enable(TX_NUM_CLKS_MAX, tx->clks);

	if (ret)

sound/soc/codecs/max98373-i2c.c

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

	case MAX98373_R2055_MEAS_ADC_THERM_CH_READBACK:

	case MAX98373_R20B6_BDE_CUR_STATE_READBACK:

	case MAX98373_R20FF_GLOBAL_SHDN:

	case MAX98373_R21FF_REV_ID:

		return true;

	default:

sound/soc/codecs/max98373-sdw.c

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

	case MAX98373_R2055_MEAS_ADC_THERM_CH_READBACK:

	case MAX98373_R20B6_BDE_CUR_STATE_READBACK:

	case MAX98373_R20FF_GLOBAL_SHDN:

	case MAX98373_R21FF_REV_ID:

	/* SoundWire Control Port Registers */

	case MAX98373_R0040_SCP_INIT_STAT_1 ... MAX98373_R0070_SCP_FRAME_CTLR: