Skip to content

Commit 062ce05

Browse files
Lucas Tanurebroonie
authored andcommitted
ASoC: cs35l41: Move power initializations to reg_sequence
ASoC and HDA systems for all revisions of CS35L41 will benefit from having this initialization, so add it to reg_sequence of each revision By moving to reg_sequence all gains are set to zero. And boost, monitoring parts, and class D amplifier are disabled. Signed-off-by: Lucas Tanure <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent fe120d4 commit 062ce05

File tree

2 files changed

+8
-15
lines changed

2 files changed

+8
-15
lines changed

sound/soc/codecs/cs35l41-lib.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
static const struct reg_default cs35l41_reg[] = {
1919
{ CS35L41_PWR_CTRL1, 0x00000000 },
20+
{ CS35L41_PWR_CTRL2, 0x00000000 },
2021
{ CS35L41_PWR_CTRL3, 0x01000010 },
2122
{ CS35L41_GPIO_PAD_CONTROL, 0x00000000 },
2223
{ CS35L41_SP_ENABLES, 0x00000000 },
@@ -46,7 +47,7 @@ static const struct reg_default cs35l41_reg[] = {
4647
{ CS35L41_CLASSH_CFG, 0x000B0405 },
4748
{ CS35L41_WKFET_CFG, 0x00000111 },
4849
{ CS35L41_NG_CFG, 0x00000033 },
49-
{ CS35L41_AMP_GAIN_CTRL, 0x00000273 },
50+
{ CS35L41_AMP_GAIN_CTRL, 0x00000000 },
5051
{ CS35L41_GPIO1_CTRL1, 0xE1000001 },
5152
{ CS35L41_GPIO2_CTRL1, 0xE1000001 },
5253
{ CS35L41_MIXER_NGATE_CFG, 0x00000000 },

sound/soc/codecs/cs35l41.c

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1288,6 +1288,8 @@ static const struct reg_sequence cs35l41_reva0_errata_patch[] = {
12881288
{ CS35L41_DSP1_XM_ACCEL_PL0_PRI, 0x00000000 },
12891289
{ 0x00000040, 0x0000CCCC },
12901290
{ 0x00000040, 0x00003333 },
1291+
{ CS35L41_PWR_CTRL2, 0x00000000 },
1292+
{ CS35L41_AMP_GAIN_CTRL, 0x00000000 },
12911293
};
12921294

12931295
static const struct reg_sequence cs35l41_revb0_errata_patch[] = {
@@ -1301,6 +1303,8 @@ static const struct reg_sequence cs35l41_revb0_errata_patch[] = {
13011303
{ CS35L41_DSP1_XM_ACCEL_PL0_PRI, 0x00000000 },
13021304
{ 0x00000040, 0x0000CCCC },
13031305
{ 0x00000040, 0x00003333 },
1306+
{ CS35L41_PWR_CTRL2, 0x00000000 },
1307+
{ CS35L41_AMP_GAIN_CTRL, 0x00000000 },
13041308
};
13051309

13061310
static const struct reg_sequence cs35l41_revb2_errata_patch[] = {
@@ -1314,6 +1318,8 @@ static const struct reg_sequence cs35l41_revb2_errata_patch[] = {
13141318
{ CS35L41_DSP1_XM_ACCEL_PL0_PRI, 0x00000000 },
13151319
{ 0x00000040, 0x0000CCCC },
13161320
{ 0x00000040, 0x00003333 },
1321+
{ CS35L41_PWR_CTRL2, 0x00000000 },
1322+
{ CS35L41_AMP_GAIN_CTRL, 0x00000000 },
13171323
};
13181324

13191325
static const struct reg_sequence cs35l41_fs_errata_patch[] = {
@@ -1556,20 +1562,6 @@ int cs35l41_probe(struct cs35l41_private *cs35l41,
15561562
goto err;
15571563
}
15581564

1559-
ret = regmap_update_bits(cs35l41->regmap, CS35L41_PWR_CTRL2,
1560-
CS35L41_AMP_EN_MASK, 0);
1561-
if (ret < 0) {
1562-
dev_err(cs35l41->dev, "Write CS35L41_PWR_CTRL2 failed: %d\n", ret);
1563-
goto err;
1564-
}
1565-
1566-
ret = regmap_update_bits(cs35l41->regmap, CS35L41_AMP_GAIN_CTRL,
1567-
CS35L41_AMP_GAIN_PCM_MASK, 0);
1568-
if (ret < 0) {
1569-
dev_err(cs35l41->dev, "Write CS35L41_AMP_GAIN_CTRL failed: %d\n", ret);
1570-
goto err;
1571-
}
1572-
15731565
ret = cs35l41_set_pdata(cs35l41);
15741566
if (ret < 0) {
15751567
dev_err(cs35l41->dev, "Set pdata failed: %d\n", ret);

0 commit comments

Comments
 (0)