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

ASoC: tas2552: Correct Boost Auto-Pass Through Control register usage 



Correct the bit definition so the code will change the bits what it
supposed to change. Also rename the register define to
TAS2552_BOOST_APT_CTRL.

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

sound/soc/codecs/tas2552.c

+3 −3
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static struct reg_default tas2552_reg_defs[] = { 
	{TAS2552_OUTPUT_DATA, 0xc0},

	{TAS2552_PDM_CFG, 0x01},

	{TAS2552_PGA_GAIN, 0x00},

	{TAS2552_BOOST_PT_CTRL, 0x0f},

	{TAS2552_BOOST_APT_CTRL, 0x0f},

	{TAS2552_RESERVED_0D, 0xbe},

	{TAS2552_LIMIT_RATE_HYS, 0x08},

	{TAS2552_CFG_2, 0xef},
@@ -601,8 +601,8 @@ static int tas2552_codec_probe(struct snd_soc_codec *codec) 
	snd_soc_write(codec, TAS2552_OUTPUT_DATA,

		      TAS2552_PDM_DATA_SEL_V_I |

		      TAS2552_R_DATA_OUT(TAS2552_DATA_OUT_V_DATA));

	snd_soc_write(codec, TAS2552_BOOST_PT_CTRL, TAS2552_APT_DELAY_200 |

				TAS2552_APT_THRESH_2_1_7);

	snd_soc_write(codec, TAS2552_BOOST_APT_CTRL, TAS2552_APT_DELAY_200 |

						     TAS2552_APT_THRESH_20_17);



	snd_soc_write(codec, TAS2552_CFG_2, TAS2552_BOOST_EN |

				  TAS2552_APT_EN | TAS2552_LIM_EN);

sound/soc/codecs/tas2552.h

+10 −11
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#define TAS2552_PDM_CFG			0x11

#define TAS2552_PGA_GAIN		0x12

#define TAS2552_EDGE_RATE_CTRL	0x13

#define TAS2552_BOOST_PT_CTRL	0x14

#define TAS2552_BOOST_APT_CTRL		0x14

#define TAS2552_VER_NUM			0x16

#define TAS2552_VBAT_DATA		0x19

#define TAS2552_MAX_REG			0x20
@@ -127,16 +127,15 @@ 
#define TAS2552_PDM_CLK_SEL_MASK	TAS2552_PDM_CLK_SEL_MCLK

#define TAS2552_PDM_DATA_ES	 	(1 << 2)



/* Boost pass-through register */

#define TAS2552_APT_DELAY_50	0x00

#define TAS2552_APT_DELAY_75	(1 << 1)

#define TAS2552_APT_DELAY_125	(1 << 2)

#define TAS2552_APT_DELAY_200	(1 << 3)



#define TAS2552_APT_THRESH_2_5		0x00

#define TAS2552_APT_THRESH_1_7		(1 << 3)

#define TAS2552_APT_THRESH_1_4_1_1	(1 << 4)

#define TAS2552_APT_THRESH_2_1_7	(0x11 << 2)

/* Boost Auto-pass through register */

#define TAS2552_APT_DELAY_50		(0x0 << 0)

#define TAS2552_APT_DELAY_75		(0x1 << 0)

#define TAS2552_APT_DELAY_125		(0x2 << 0)

#define TAS2552_APT_DELAY_200		(0x3 << 0)

#define TAS2552_APT_THRESH_05_02	(0x0 << 2)

#define TAS2552_APT_THRESH_10_07	(0x1 << 2)

#define TAS2552_APT_THRESH_14_11	(0x2 << 2)

#define TAS2552_APT_THRESH_20_17	(0x3 << 2)



/* PLL Control Register */

#define TAS2552_PLL_J_MASK		0x7f