From ea40ea0aceec718ea8ab28ac6fad051c8a3a6952 Mon Sep 17 00:00:00 2001 From: vkarp Date: Fri, 10 Aug 2018 12:27:01 -0500 Subject: [PATCH] Revert "ASoC: cs35l41: Specify CSPL_CMD address" This reverts commit dedc905d09d87794b2d5040e1ae8c82f75e1ab9b. Mot-CRs-fixed: (CR): River: AoU bringup on Marley+Prince Change-Id: Ia7a8ae1bd6d8dfc483ecbc19ed0e984c515fb7f9 Reviewed-on: https://gerrit.mot.com/1238843 Tested-by: Jira Key SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Reviewed-by: Konstantin Makariev Submit-Approved: Jira Key --- include/sound/cs35l41.h | 1 - sound/soc/codecs/cs35l41.c | 12 +++--------- sound/soc/codecs/cs35l41.h | 7 ++++--- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/include/sound/cs35l41.h b/include/sound/cs35l41.h index 1e61d751e85a..872fe4bb826d 100644 --- a/include/sound/cs35l41.h +++ b/include/sound/cs35l41.h @@ -61,7 +61,6 @@ struct cs35l41_private { int extclk_freq; int extclk_cfg; int sclk; - unsigned int cspl_cmd_reg; bool tdm_mode; bool i2s_mode; bool swire_mode; diff --git a/sound/soc/codecs/cs35l41.c b/sound/soc/codecs/cs35l41.c index 34b4641ab3b3..b91d9f5b3f21 100644 --- a/sound/soc/codecs/cs35l41.c +++ b/sound/soc/codecs/cs35l41.c @@ -175,12 +175,12 @@ static int cs35l41_dsp_load_ev(struct snd_soc_dapm_widget *w, cs35l41->halo_booted = true; } - regmap_write(cs35l41->regmap, cs35l41->cspl_cmd_reg, - CS35L41_CSPL_CMD_UNMUTE); + regmap_write(cs35l41->regmap, CS35L41_CSPL_COMMAND, + (CS35L41_CSPL_CMD_UNMUTE)); return 0; case SND_SOC_DAPM_PRE_PMD: - regmap_write(cs35l41->regmap, cs35l41->cspl_cmd_reg, + regmap_write(cs35l41->regmap, CS35L41_CSPL_COMMAND, CS35L41_CSPL_CMD_MUTE); default: return 0; @@ -1720,12 +1720,6 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, "Failed to apply A0 errata patch %d\n", ret); goto err; } - - cs35l41->cspl_cmd_reg = CS35L41_CSPL_COMMAND_REV_A0; - break; - case CS35L41_REVID_B0: - cs35l41->cspl_cmd_reg = CS35L41_CSPL_COMMAND_REV_B0; - break; } ret = cs35l41_otp_unpack(cs35l41); diff --git a/sound/soc/codecs/cs35l41.h b/sound/soc/codecs/cs35l41.h index 115b98a265b9..fa26c95723b5 100644 --- a/sound/soc/codecs/cs35l41.h +++ b/sound/soc/codecs/cs35l41.h @@ -696,7 +696,6 @@ #define CS35L41R_CHIP_ID 0x35b40 #define CS35L41_MTLREVID_MASK 0x0F #define CS35L41_REVID_A0 0xA0 -#define CS35L41_REVID_B0 0xB0 #define CS35L41_DSP_N_RX_RATES 8 #define CS35L41_DSP_N_TX_RATES 8 @@ -734,7 +733,9 @@ extern const struct cs35l41_otp_map_element_t #define CS35L41_CSPL_CMD_UNMUTE 2 #define CS35L41_CSPL_CMD_REINIT 3 -#define CS35L41_CSPL_COMMAND_REV_A0 0x02800210 -#define CS35L41_CSPL_COMMAND_REV_B0 0x02800234 +#define CS35L41_CSPL_XM_STRUCT_ADDR 0x0280020c +#define CS35L41_CSPL_COMMAND 0x02800210 +#define CS35L41_CSPL_CAL_STRUCT_ADDR 0x02800224 +#define CS35L41_AMB_TEMP_DEFAULT 25 #endif /*__CS35L41_H__*/