1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
|
From ba5fcc25b726559cb36d61196c58c865190a8a7b Mon Sep 17 00:00:00 2001
From c0c65da7ca4b0a4f93272f5e932dd7eed90703c8 Mon Sep 17 00:00:00 2001
From: Ethan Geller <ethang@valvesoftware.com>
Date: Thu, 16 Nov 2023 21:31:48 +0000
Subject: [PATCH] Fix for Max98388 issue where speakers would not be powered on
when we resume from S3.
The issue was that when we flush the regmap to the amp on resume, we were also flushing a value of 1 to the SW_RESET pin.
Theoretically, this is fixed by marking the SW_RESET register volatile. However, we did not observe a fix after marking the register volatile, so we opted for a more complete fix of ensuring SW_RESET is zero in our regmap after we have waited for the reset loop to be complete.
---
sound/soc/codecs/max98388.c | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/max98388.c b/sound/soc/codecs/max98388.c
index 293ec172e0a71..4c495e0e33f90 100644
--- a/sound/soc/codecs/max98388.c
+++ b/sound/soc/codecs/max98388.c
@@ -391,27 +391,43 @@ void max98388_reset(struct max98388_priv *max98388, struct device *dev)
{
int ret, reg, count;
+
/* Software Reset */
ret = regmap_update_bits(max98388->regmap,
MAX98388_R2000_SW_RESET,
MAX98388_SOFT_RESET,
MAX98388_SOFT_RESET);
- if (ret)
+
+ if (ret) {
dev_err(dev, "Reset command failed. (ret:%d)\n", ret);
+ goto exit;
+ }
+
count = 0;
while (count < 3) {
usleep_range(10000, 11000);
+
/* Software Reset Verification */
ret = regmap_read(max98388->regmap,
MAX98388_R22FF_REV_ID, ®);
+
if (!ret) {
dev_info(dev, "Reset completed (retry:%d)\n", count);
- return;
+ goto exit;
}
count++;
}
+
dev_err(dev, "Reset failed. (ret:%d)\n", ret);
+
+
+exit:
+ regcache_cache_only(max98388->regmap, true);
+ ret = regmap_update_bits(max98388->regmap,
+ MAX98388_R2000_SW_RESET,
+ MAX98388_SOFT_RESET, 0);
+ regcache_cache_only(max98388->regmap, false);
}
static int max98388_probe(struct snd_soc_component *component)
@@ -420,6 +436,7 @@ static int max98388_probe(struct snd_soc_component *component)
/* Software Reset */
max98388_reset(max98388, component->dev);
+ usleep_range(400, 1000);
/* General channel source configuration */
regmap_write(max98388->regmap,
@@ -812,6 +829,7 @@ static bool max98388_readable_register(struct device *dev,
case MAX98388_R210E_AUTO_RESTART:
case MAX98388_R210F_GLOBAL_EN:
case MAX98388_R22FF_REV_ID:
+ case MAX98388_R2000_SW_RESET:
return true;
default:
return false;
@@ -824,6 +842,7 @@ static bool max98388_volatile_reg(struct device *dev, unsigned int reg)
case MAX98388_R2001_INT_RAW1 ... MAX98388_R2005_INT_STATE2:
case MAX98388_R210F_GLOBAL_EN:
case MAX98388_R22FF_REV_ID:
+ case MAX98388_R2000_SW_RESET:
return true;
default:
return false;
@@ -868,6 +887,7 @@ static int max98388_resume(struct device *dev)
regcache_cache_only(max98388->regmap, false);
max98388_reset(max98388, dev);
+ usleep_range(400, 1000);
regcache_sync(max98388->regmap);
return 0;
--
GitLab
From 4855323691ea7dd2288c51cd11f00561f9ba22df Mon Sep 17 00:00:00 2001
From: Thomas Crider <gloriouseggroll@gmail.com>
Date: Tue, 5 Dec 2023 05:13:41 -0500
Subject: [PATCH] cs35l41 fixup
---
sound/soc/amd/acp/acp-mach-common.c | 107 ++++++++++++++++++++++++++++
sound/soc/amd/acp/acp-mach.h | 4 ++
sound/soc/amd/acp/acp-sof-mach.c | 2 +
sound/soc/sof/ipc3-topology.c | 11 +--
sound/soc/sof/topology.c | 3 +-
5 files changed, 122 insertions(+), 5 deletions(-)
diff --git a/sound/soc/amd/acp/acp-mach-common.c b/sound/soc/amd/acp/acp-mach-common.c
index a06af82b8..ae32748a5 100644
--- a/sound/soc/amd/acp/acp-mach-common.c
+++ b/sound/soc/amd/acp/acp-mach-common.c
@@ -26,6 +26,8 @@
#include "../../codecs/rt5682s.h"
#include "../../codecs/nau8825.h"
#include "../../codecs/nau8821.h"
+#include "../../codecs/cs35l41.h"
+
#include "acp-mach.h"
#define PCO_PLAT_CLK 48000000
@@ -1282,6 +1282,78 @@
DAILINK_COMP_ARRAY(COMP_CODEC("i2c-NVTN2020:00",
"nau8821-hifi")));
+static int acp_cs35l41_init(struct snd_soc_pcm_runtime *rtd)
+{
+ return 0;
+}
+
+static int acp_cs35l41_startup(struct snd_pcm_substream *substream)
+{
+ struct snd_pcm_runtime *runtime = substream->runtime;
+
+ runtime->hw.channels_max = DUAL_CHANNEL;
+ snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
+ &constraints_channels);
+ snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
+ &constraints_rates);
+ return 0;
+}
+
+static int acp_cs35l41_hw_params(struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *params)
+{
+ struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
+ struct snd_soc_card *card = rtd->card;
+ struct snd_soc_dai *codec_dai;
+ int ret, i;
+ unsigned int num_codecs = rtd->dai_link->num_codecs;
+ unsigned int bclk_val;
+
+ ret = 0;
+ for (i = 0; i < num_codecs; i++) {
+ codec_dai = snd_soc_rtd_to_codec(rtd, i);
+ if (strcmp(codec_dai->name, "cs35l41-pcm") == 0) {
+ switch (params_rate(params)) {
+ case 48000:
+ bclk_val = 1536000;
+ break;
+ default:
+ dev_err(card->dev, "Invalid Samplerate:0x%x\n",
+ params_rate(params));
+ return -EINVAL;
+ }
+ ret = snd_soc_component_set_sysclk(codec_dai->component,
+ 0, 0, bclk_val, SND_SOC_CLOCK_IN);
+ if (ret < 0) {
+ dev_err(card->dev, "failed to set sysclk for CS35l41 dai\n");
+ return ret;
+ }
+ }
+ }
+
+ return ret;
+}
+
+static struct snd_soc_codec_conf cs35l41_conf[] = {
+ {
+ .dlc = COMP_CODEC_CONF("spi-VLV1776:00"),
+ .name_prefix = "Left",
+ },
+ {
+ .dlc = COMP_CODEC_CONF("spi-VLV1776:01"),
+ .name_prefix = "Right",
+ },
+};
+
+static const struct snd_soc_ops acp_cs35l41_ops = {
+ .startup = acp_cs35l41_startup,
+ .hw_params = acp_cs35l41_hw_params,
+};
+
+SND_SOC_DAILINK_DEF(cs35l41,
+ DAILINK_COMP_ARRAY(COMP_CODEC("spi-VLV1776:00", "cs35l41-pcm"),
+ COMP_CODEC("spi-VLV1776:01", "cs35l41-pcm")));
+
/* Declare DMIC codec components */
SND_SOC_DAILINK_DEF(dmic_codec,
DAILINK_COMP_ARRAY(COMP_CODEC("dmic-codec", "dmic-hifi")));
@@ -1543,6 +1543,14 @@
card->codec_conf = rt1019_conf;
card->num_configs = ARRAY_SIZE(rt1019_conf);
}
+ if (drv_data->amp_codec_id == CS35L41) {
+ links[i].codecs = cs35l41;
+ links[i].num_codecs = ARRAY_SIZE(cs35l41);
+ links[i].init = acp_cs35l41_init;
+ card->codec_conf = cs35l41_conf;
+ card->num_configs = ARRAY_SIZE(cs35l41_conf);
+ links[i].ops = &acp_cs35l41_ops;
+ }
i++;
}
diff --git a/sound/soc/amd/acp/acp-mach.h b/sound/soc/amd/acp/acp-mach.h
index 2b3ec6594..6feef5a93 100644
--- a/sound/soc/amd/acp/acp-mach.h
+++ b/sound/soc/amd/acp/acp-mach.h
@@ -49,6 +49,7 @@
NAU8821,
MAX98388,
ES83XX,
+ CS35L41,
};
enum platform_end_point {
--
2.43.0
|
