Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a571cb17 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: tas2552: Configure the WCLK frequency based on the stream 



Instead of hard wiring the WCLK frequency at probe time do it runtime.
The hard wired 88_96KHz was not even setting the correct bits since it was
defined as (1 << 6) which will  change the I2S_OUT_SEL bit and will leave
the amplifier configured for 8KHz.
At the same time clean up and fix the CFG3 register bits.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d20b098d

sound/soc/codecs/tas2552.c

+41 −2
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static int tas2552_hw_params(struct snd_pcm_substream *substream, 
	int d;

	int cpf;

	u8 p, j;

	u8 ser_ctrl1_reg;

	u8 ser_ctrl1_reg, wclk_rate;



	switch (params_width(params)) {

	case 16:
@@ -206,6 +206,45 @@ static int tas2552_hw_params(struct snd_pcm_substream *substream, 
			    TAS2552_WORDLENGTH_MASK | TAS2552_CLKSPERFRAME_MASK,

			    ser_ctrl1_reg);



	switch (params_rate(params)) {

	case 8000:

		wclk_rate = TAS2552_WCLK_FREQ_8KHZ;

		break;

	case 11025:

	case 12000:

		wclk_rate = TAS2552_WCLK_FREQ_11_12KHZ;

		break;

	case 16000:

		wclk_rate = TAS2552_WCLK_FREQ_16KHZ;

		break;

	case 22050:

	case 24000:

		wclk_rate = TAS2552_WCLK_FREQ_22_24KHZ;

		break;

	case 32000:

		wclk_rate = TAS2552_WCLK_FREQ_32KHZ;

		break;

	case 44100:

	case 48000:

		wclk_rate = TAS2552_WCLK_FREQ_44_48KHZ;

		break;

	case 88200:

	case 96000:

		wclk_rate = TAS2552_WCLK_FREQ_88_96KHZ;

		break;

	case 176400:

	case 192000:

		wclk_rate = TAS2552_WCLK_FREQ_176_192KHZ;

		break;

	default:

		dev_err(codec->dev, "Not supported sample rate: %d\n",

			params_rate(params));

		return -EINVAL;

	}



	snd_soc_update_bits(codec, TAS2552_CFG_3, TAS2552_WCLK_FREQ_MASK,

			    wclk_rate);



	if (!tas2552->pll_clkin)

		return -EINVAL;
@@ -503,7 +542,7 @@ static int tas2552_codec_probe(struct snd_soc_codec *codec) 


	snd_soc_update_bits(codec, TAS2552_CFG_1, TAS2552_MUTE, TAS2552_MUTE);

	snd_soc_write(codec, TAS2552_CFG_3, TAS2552_I2S_OUT_SEL |

				TAS2552_DIN_SRC_SEL_AVG_L_R | TAS2552_88_96KHZ);

					    TAS2552_DIN_SRC_SEL_AVG_L_R);

	snd_soc_write(codec, TAS2552_DOUT, TAS2552_PDM_DATA_I);

	snd_soc_write(codec, TAS2552_OUTPUT_DATA, TAS2552_PDM_DATA_V_I | 0x8);

	snd_soc_write(codec, TAS2552_BOOST_PT_CTRL, TAS2552_APT_DELAY_200 |

sound/soc/codecs/tas2552.h

+18 −19
Original line number Diff line number Diff line
@@ -62,6 +62,24 @@ 
#define TAS2552_LIM_EN			(1 << 2)

#define TAS2552_IVSENSE_EN		(1 << 1)



/* CFG3 Register Masks */

#define TAS2552_WCLK_FREQ_8KHZ		(0x0 << 0)

#define TAS2552_WCLK_FREQ_11_12KHZ	(0x1 << 0)

#define TAS2552_WCLK_FREQ_16KHZ		(0x2 << 0)

#define TAS2552_WCLK_FREQ_22_24KHZ	(0x3 << 0)

#define TAS2552_WCLK_FREQ_32KHZ		(0x4 << 0)

#define TAS2552_WCLK_FREQ_44_48KHZ	(0x5 << 0)

#define TAS2552_WCLK_FREQ_88_96KHZ	(0x6 << 0)

#define TAS2552_WCLK_FREQ_176_192KHZ	(0x7 << 0)

#define TAS2552_WCLK_FREQ_MASK		TAS2552_WCLK_FREQ_176_192KHZ

#define TAS2552_DIN_SRC_SEL_MUTED	(0x0 << 3)

#define TAS2552_DIN_SRC_SEL_LEFT	(0x1 << 3)

#define TAS2552_DIN_SRC_SEL_RIGHT	(0x2 << 3)

#define TAS2552_DIN_SRC_SEL_AVG_L_R	(0x3 << 3)

#define TAS2552_PDM_IN_SEL		(1 << 5)

#define TAS2552_I2S_OUT_SEL		(1 << 6)

#define TAS2552_ANALOG_IN_SEL		(1 << 7)



/* DOUT Register Masks */

#define TAS2552_SDOUT_TRISTATE		(1 << 2)
@@ -84,25 +102,6 @@ 
#define TAS2552_BCLKDIR			(1 << 6)

#define TAS2552_WCLKDIR			(1 << 7)



#define TAS2552_DIN_SRC_SEL_MUTED	0x00

#define TAS2552_DIN_SRC_SEL_LEFT	(1 << 4)

#define TAS2552_DIN_SRC_SEL_RIGHT	(1 << 5)

#define TAS2552_DIN_SRC_SEL_AVG_L_R	(0x11 << 4)



#define TAS2552_PDM_IN_SEL		(1 << 5)

#define TAS2552_I2S_OUT_SEL		(1 << 6)

#define TAS2552_ANALOG_IN_SEL	(1 << 7)



/* CFG3 WCLK Dividers */

#define TAS2552_8KHZ		0x00

#define TAS2552_11_12KHZ	(1 << 1)

#define TAS2552_16KHZ		(1 << 2)

#define TAS2552_22_24KHZ	(1 << 3)

#define TAS2552_32KHZ		(1 << 4)

#define TAS2552_44_48KHZ	(1 << 5)

#define TAS2552_88_96KHZ	(1 << 6)

#define TAS2552_176_192KHZ	(1 << 7)



/* OUTPUT_DATA register */

#define TAS2552_PDM_DATA_I		0x00

#define TAS2552_PDM_DATA_V		(1 << 6)