Unverified Commit 3656667e authored by Lucas Tanure's avatar Lucas Tanure Committed by Mark Brown
Browse files

ASoC: cs42l42: Fix channel width support 



Remove the hard coded 32 bits width and replace with the correct width
calculated by params_width.

Signed-off-by: default avatarLucas Tanure <tanureal@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20210305173442.195740-3-tanureal@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 97e2b5e5

sound/soc/codecs/cs42l42.c

+22 −25
Original line number Diff line number Diff line
@@ -691,24 +691,6 @@ static int cs42l42_pll_config(struct snd_soc_component *component) 
					CS42L42_CLK_OASRC_SEL_MASK,

					CS42L42_CLK_OASRC_SEL_12 <<

					CS42L42_CLK_OASRC_SEL_SHIFT);

			/* channel 1 on low LRCLK, 32 bit */

			snd_soc_component_update_bits(component,

					CS42L42_ASP_RX_DAI0_CH1_AP_RES,

					CS42L42_ASP_RX_CH_AP_MASK |

					CS42L42_ASP_RX_CH_RES_MASK,

					(CS42L42_ASP_RX_CH_AP_LOW <<

					CS42L42_ASP_RX_CH_AP_SHIFT) |

					(CS42L42_ASP_RX_CH_RES_32 <<

					CS42L42_ASP_RX_CH_RES_SHIFT));

			/* Channel 2 on high LRCLK, 32 bit */

			snd_soc_component_update_bits(component,

					CS42L42_ASP_RX_DAI0_CH2_AP_RES,

					CS42L42_ASP_RX_CH_AP_MASK |

					CS42L42_ASP_RX_CH_RES_MASK,

					(CS42L42_ASP_RX_CH_AP_HI <<

					CS42L42_ASP_RX_CH_AP_SHIFT) |

					(CS42L42_ASP_RX_CH_RES_32 <<

					CS42L42_ASP_RX_CH_RES_SHIFT));

			if (pll_ratio_table[i].mclk_src_sel == 0) {

				/* Pass the clock straight through */

				snd_soc_component_update_bits(component,
@@ -824,14 +806,29 @@ static int cs42l42_pcm_hw_params(struct snd_pcm_substream *substream, 
{

	struct snd_soc_component *component = dai->component;

	struct cs42l42_private *cs42l42 = snd_soc_component_get_drvdata(component);

	int retval;

	unsigned int width = (params_width(params) / 8) - 1;

	unsigned int val = 0;



	cs42l42->srate = params_rate(params);

	cs42l42->swidth = params_width(params);



	retval = cs42l42_pll_config(component);

	switch(substream->stream) {

	case SNDRV_PCM_STREAM_PLAYBACK:

		val |= width << CS42L42_ASP_RX_CH_RES_SHIFT;

		/* channel 1 on low LRCLK */

		snd_soc_component_update_bits(component, CS42L42_ASP_RX_DAI0_CH1_AP_RES,

							 CS42L42_ASP_RX_CH_AP_MASK |

							 CS42L42_ASP_RX_CH_RES_MASK, val);

		/* Channel 2 on high LRCLK */

		val |= CS42L42_ASP_RX_CH_AP_HI << CS42L42_ASP_RX_CH_AP_SHIFT;

		snd_soc_component_update_bits(component, CS42L42_ASP_RX_DAI0_CH2_AP_RES,

							 CS42L42_ASP_RX_CH_AP_MASK |

							 CS42L42_ASP_RX_CH_RES_MASK, val);

		break;

	default:

		break;

	}



	return retval;

	return cs42l42_pll_config(component);

}



static int cs42l42_set_sysclk(struct snd_soc_dai *dai,
@@ -896,8 +893,8 @@ static int cs42l42_mute(struct snd_soc_dai *dai, int mute, int direction) 
	return 0;

}



#define CS42L42_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S18_3LE | \

			SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_S24_LE | \

#define CS42L42_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\

			 SNDRV_PCM_FMTBIT_S24_LE |\

			 SNDRV_PCM_FMTBIT_S32_LE )

sound/soc/codecs/cs42l42.h

+0 −1
Original line number Diff line number Diff line
@@ -757,7 +757,6 @@ struct cs42l42_private { 
	struct completion pdn_done;

	u32 sclk;

	u32 srate;

	u32 swidth;

	u8 plug_state;

	u8 hs_type;

	u8 ts_inv;