Commit 5a56996b authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v5.6-rc4' of... 

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

ASoC: Fixes for v5.6

More fixes that have arrived since the merge window, spread out all
over.  There's a few things like the operation callback addition for
rt1015 and the meson reset addition which add small new bits of
functionality to fix non-working systems, they're all very small and for
parts of newly added functionality.
parents 95dbf14b 3fb83cbe

include/sound/soc.h

+1 −1
Original line number Diff line number Diff line
@@ -1157,7 +1157,7 @@ struct snd_soc_pcm_runtime { 
	     ((i) < rtd->num_codecs) && ((dai) = rtd->codec_dais[i]); \

	     (i)++)

#define for_each_rtd_codec_dai_rollback(rtd, i, dai)		\

	for (; ((--i) >= 0) && ((dai) = rtd->codec_dais[i]);)

	for (; (--(i) >= 0) && ((dai) = rtd->codec_dais[i]);)



void snd_soc_close_delayed_work(struct snd_soc_pcm_runtime *rtd);

sound/soc/codecs/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1406,7 +1406,7 @@ config SND_SOC_WM8737 
	depends on SND_SOC_I2C_AND_SPI



config SND_SOC_WM8741

	tristate "Wolfson Microelectronics WM8737 DAC"

	tristate "Wolfson Microelectronics WM8741 DAC"

	depends on SND_SOC_I2C_AND_SPI



config SND_SOC_WM8750

sound/soc/codecs/pcm512x.c

+5 −3
Original line number Diff line number Diff line
@@ -1564,13 +1564,15 @@ int pcm512x_probe(struct device *dev, struct regmap *regmap) 
	}



	pcm512x->sclk = devm_clk_get(dev, NULL);

	if (PTR_ERR(pcm512x->sclk) == -EPROBE_DEFER)

		return -EPROBE_DEFER;

	if (PTR_ERR(pcm512x->sclk) == -EPROBE_DEFER) {

		ret = -EPROBE_DEFER;

		goto err;

	}

	if (!IS_ERR(pcm512x->sclk)) {

		ret = clk_prepare_enable(pcm512x->sclk);

		if (ret != 0) {

			dev_err(dev, "Failed to enable SCLK: %d\n", ret);

			return ret;

			goto err;

		}

	}

sound/soc/codecs/rt1015.c

+2 −1
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ static int rt1015_hw_params(struct snd_pcm_substream *substream, 
	snd_soc_component_update_bits(component, RT1015_TDM_MASTER,

		RT1015_I2S_DL_MASK, val_len);

	snd_soc_component_update_bits(component, RT1015_CLK2,

		RT1015_FS_PD_MASK, pre_div);

		RT1015_FS_PD_MASK, pre_div << RT1015_FS_PD_SFT);



	return 0;

}
@@ -857,6 +857,7 @@ struct snd_soc_dai_driver rt1015_dai[] = { 
			.rates = RT1015_STEREO_RATES,

			.formats = RT1015_FORMATS,

		},

		.ops = &rt1015_aif_dai_ops,

	}

};

sound/soc/codecs/tas2562.c

+3 −2
Original line number Diff line number Diff line
@@ -215,7 +215,8 @@ static int tas2562_set_bitwidth(struct tas2562_data *tas2562, int bitwidth) 
		break;



	default:

		dev_info(tas2562->dev, "Not supported params format\n");

		dev_info(tas2562->dev, "Unsupported bitwidth format\n");

		return -EINVAL;

	}



	ret = snd_soc_component_update_bits(tas2562->component,
@@ -251,7 +252,7 @@ static int tas2562_hw_params(struct snd_pcm_substream *substream, 


	ret = tas2562_set_samplerate(tas2562, params_rate(params));

	if (ret)

		dev_err(tas2562->dev, "set bitwidth failed, %d\n", ret);

		dev_err(tas2562->dev, "set sample rate failed, %d\n", ret);



	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE