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

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

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

ASoC: Fixes for v6.6

There's quite a lot of changes here, but a lot of them are simple quirks
or device IDs rather than actual fixes.  The fixes that are here are all
quite device specific and relatively minor.
parents d93eeca6 7e1fe5d9

Documentation/devicetree/bindings/sound/rockchip-spdif.yaml

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ properties: 
      - const: rockchip,rk3568-spdif

      - items:

          - enum:

              - rockchip,rk3128-spdif

              - rockchip,rk3188-spdif

              - rockchip,rk3288-spdif

              - rockchip,rk3308-spdif

sound/soc/fsl/fsl-asoc-card.c

+8 −4
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ struct codec_priv { 
	unsigned long mclk_freq;

	unsigned long free_freq;

	u32 mclk_id;

	u32 fll_id;

	u32 pll_id;

	int fll_id;

	int pll_id;

};



/**
@@ -206,7 +206,7 @@ static int fsl_asoc_card_hw_params(struct snd_pcm_substream *substream, 
	}



	/* Specific configuration for PLL */

	if (codec_priv->pll_id && codec_priv->fll_id) {

	if (codec_priv->pll_id >= 0 && codec_priv->fll_id >= 0) {

		if (priv->sample_format == SNDRV_PCM_FORMAT_S24_LE)

			pll_out = priv->sample_rate * 384;

		else
@@ -248,7 +248,7 @@ static int fsl_asoc_card_hw_free(struct snd_pcm_substream *substream) 


	priv->streams &= ~BIT(substream->stream);



	if (!priv->streams && codec_priv->pll_id && codec_priv->fll_id) {

	if (!priv->streams && codec_priv->pll_id >= 0 && codec_priv->fll_id >= 0) {

		/* Force freq to be free_freq to avoid error message in codec */

		ret = snd_soc_dai_set_sysclk(asoc_rtd_to_codec(rtd, 0),

					     codec_priv->mclk_id,
@@ -621,6 +621,10 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) 
	priv->card.dapm_routes = audio_map;

	priv->card.num_dapm_routes = ARRAY_SIZE(audio_map);

	priv->card.driver_name = DRIVER_NAME;



	priv->codec_priv.fll_id = -1;

	priv->codec_priv.pll_id = -1;



	/* Diversify the card configurations */

	if (of_device_is_compatible(np, "fsl,imx-audio-cs42888")) {

		codec_dai_name = "cs42888";

sound/soc/fsl/fsl_sai.c

+7 −2
Original line number Diff line number Diff line
@@ -710,10 +710,15 @@ static void fsl_sai_config_disable(struct fsl_sai *sai, int dir) 
{

	unsigned int ofs = sai->soc_data->reg_offset;

	bool tx = dir == TX;

	u32 xcsr, count = 100;

	u32 xcsr, count = 100, mask;



	if (sai->soc_data->mclk_with_tere && sai->mclk_direction_output)

		mask = FSL_SAI_CSR_TERE;

	else

		mask = FSL_SAI_CSR_TERE | FSL_SAI_CSR_BCE;



	regmap_update_bits(sai->regmap, FSL_SAI_xCSR(tx, ofs),

			   FSL_SAI_CSR_TERE | FSL_SAI_CSR_BCE, 0);

			   mask, 0);



	/* TERE will remain set till the end of current frame */

	do {

sound/soc/generic/simple-card-utils.c

+2 −1
Original line number Diff line number Diff line
@@ -310,7 +310,8 @@ int asoc_simple_startup(struct snd_pcm_substream *substream) 
		if (fixed_sysclk % props->mclk_fs) {

			dev_err(rtd->dev, "fixed sysclk %u not divisible by mclk_fs %u\n",

				fixed_sysclk, props->mclk_fs);

			return -EINVAL;

			ret = -EINVAL;

			goto codec_err;

		}

		ret = snd_pcm_hw_constraint_minmax(substream->runtime, SNDRV_PCM_HW_PARAM_RATE,

			fixed_rate, fixed_rate);

sound/soc/generic/simple-card.c

+4 −2
Original line number Diff line number Diff line
@@ -759,10 +759,12 @@ static int asoc_simple_probe(struct platform_device *pdev) 
		struct snd_soc_dai_link *dai_link = priv->dai_link;

		struct simple_dai_props *dai_props = priv->dai_props;



		ret = -EINVAL;



		cinfo = dev->platform_data;

		if (!cinfo) {

			dev_err(dev, "no info for asoc-simple-card\n");

			return -EINVAL;

			goto err;

		}



		if (!cinfo->name ||
@@ -771,7 +773,7 @@ static int asoc_simple_probe(struct platform_device *pdev) 
		    !cinfo->platform ||

		    !cinfo->cpu_dai.name) {

			dev_err(dev, "insufficient asoc_simple_card_info settings\n");

			return -EINVAL;

			goto err;

		}



		cpus			= dai_link->cpus;