Skip to content

Commit f4f473f

Browse files
brooniebroonie
committed
ASoC: Intel: avs: Refactor jack handling
Merge series from Cezary Rojewski <[email protected]>: For all the boards included in this patchset, a similar set of changes is proposed: 1) Move jack unassignment from platform_device->remove() to dai_link->exit(). This is done to make jack init and deinit flows symmetric 2) Remove platform_device->remove() function 3) Simplify card->suspend_pre() and card->resume_post() by making use of snd_soc_card_get_codec_dai() helper While bdw_rt286 board - which is utilized by the catpt-driver - is definitely not part of "avs", same treatment applies. And thus decided to make it part of this series instead of sending it separately.
2 parents e8679db + 28baae9 commit f4f473f

File tree

6 files changed

+82
-146
lines changed

6 files changed

+82
-146
lines changed

‎sound/soc/intel/avs/boards/da7219.c

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ static const struct snd_soc_dapm_route card_base_routes[] = {
7272

7373
static int avs_da7219_codec_init(struct snd_soc_pcm_runtime *runtime)
7474
{
75-
struct snd_soc_component *component = asoc_rtd_to_codec(runtime, 0)->component;
75+
struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(runtime, 0);
76+
struct snd_soc_component *component = codec_dai->component;
7677
struct snd_soc_card *card = runtime->card;
7778
struct snd_soc_jack *jack;
78-
struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(runtime, 0);
7979
int clk_freq;
8080
int ret;
8181

@@ -109,9 +109,12 @@ static int avs_da7219_codec_init(struct snd_soc_pcm_runtime *runtime)
109109
snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN);
110110
snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOICECOMMAND);
111111

112-
snd_soc_component_set_jack(component, jack, NULL);
112+
return snd_soc_component_set_jack(component, jack, NULL);
113+
}
113114

114-
return 0;
115+
static void avs_da7219_codec_exit(struct snd_soc_pcm_runtime *rtd)
116+
{
117+
snd_soc_component_set_jack(asoc_rtd_to_codec(rtd, 0)->component, NULL, NULL);
115118
}
116119

117120
static int avs_create_dai_link(struct device *dev, const char *platform_name, int ssp_port,
@@ -146,6 +149,7 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
146149
dl->id = 0;
147150
dl->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS;
148151
dl->init = avs_da7219_codec_init;
152+
dl->exit = avs_da7219_codec_exit;
149153
dl->nonatomic = 1;
150154
dl->no_pcm = 1;
151155
dl->dpcm_capture = 1;
@@ -188,30 +192,19 @@ static int avs_create_dapm_routes(struct device *dev, int ssp_port,
188192
return 0;
189193
}
190194

191-
static int avs_card_set_jack(struct snd_soc_card *card, struct snd_soc_jack *jack)
192-
{
193-
struct snd_soc_component *component;
194-
195-
for_each_card_components(card, component)
196-
snd_soc_component_set_jack(component, jack, NULL);
197-
return 0;
198-
}
199-
200-
static int avs_card_remove(struct snd_soc_card *card)
201-
{
202-
return avs_card_set_jack(card, NULL);
203-
}
204-
205195
static int avs_card_suspend_pre(struct snd_soc_card *card)
206196
{
207-
return avs_card_set_jack(card, NULL);
197+
struct snd_soc_dai *codec_dai = snd_soc_card_get_codec_dai(card, DA7219_DAI_NAME);
198+
199+
return snd_soc_component_set_jack(codec_dai->component, NULL, NULL);
208200
}
209201

210202
static int avs_card_resume_post(struct snd_soc_card *card)
211203
{
204+
struct snd_soc_dai *codec_dai = snd_soc_card_get_codec_dai(card, DA7219_DAI_NAME);
212205
struct snd_soc_jack *jack = snd_soc_card_get_drvdata(card);
213206

214-
return avs_card_set_jack(card, jack);
207+
return snd_soc_component_set_jack(codec_dai->component, jack, NULL);
215208
}
216209

217210
static int avs_da7219_probe(struct platform_device *pdev)
@@ -249,7 +242,6 @@ static int avs_da7219_probe(struct platform_device *pdev)
249242
card->name = "avs_da7219";
250243
card->dev = dev;
251244
card->owner = THIS_MODULE;
252-
card->remove = avs_card_remove;
253245
card->suspend_pre = avs_card_suspend_pre;
254246
card->resume_post = avs_card_resume_post;
255247
card->dai_link = dai_link;

‎sound/soc/intel/avs/boards/nau8825.c

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,9 @@ static struct snd_soc_jack_pin card_headset_pins[] = {
7979

8080
static int avs_nau8825_codec_init(struct snd_soc_pcm_runtime *runtime)
8181
{
82-
struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(runtime, 0);
83-
struct snd_soc_component *component = codec_dai->component;
82+
struct snd_soc_card *card = runtime->card;
8483
struct snd_soc_jack_pin *pins;
8584
struct snd_soc_jack *jack;
86-
struct snd_soc_card *card = runtime->card;
8785
int num_pins, ret;
8886

8987
jack = snd_soc_card_get_drvdata(card);
@@ -108,11 +106,12 @@ static int avs_nau8825_codec_init(struct snd_soc_pcm_runtime *runtime)
108106
snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP);
109107
snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);
110108

111-
//snd_soc_component_set_jack(component, jack, NULL);
112-
// TODO: Fix nau8825 codec to use .set_jack, like everyone else
113-
nau8825_enable_jack_detect(component, jack);
109+
return snd_soc_component_set_jack(asoc_rtd_to_codec(runtime, 0)->component, jack, NULL);
110+
}
114111

115-
return 0;
112+
static void avs_nau8825_codec_exit(struct snd_soc_pcm_runtime *rtd)
113+
{
114+
snd_soc_component_set_jack(asoc_rtd_to_codec(rtd, 0)->component, NULL, NULL);
116115
}
117116

118117
static int
@@ -203,6 +202,7 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
203202
dl->id = 0;
204203
dl->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS;
205204
dl->init = avs_nau8825_codec_init;
205+
dl->exit = avs_nau8825_codec_exit;
206206
dl->be_hw_params_fixup = avs_nau8825_be_fixup;
207207
dl->ops = &avs_nau8825_ops;
208208
dl->nonatomic = 1;
@@ -247,23 +247,11 @@ static int avs_create_dapm_routes(struct device *dev, int ssp_port,
247247
return 0;
248248
}
249249

250-
static int avs_card_set_jack(struct snd_soc_card *card, struct snd_soc_jack *jack)
251-
{
252-
struct snd_soc_component *component;
253-
254-
for_each_card_components(card, component)
255-
snd_soc_component_set_jack(component, jack, NULL);
256-
return 0;
257-
}
258-
259-
static int avs_card_remove(struct snd_soc_card *card)
260-
{
261-
return avs_card_set_jack(card, NULL);
262-
}
263-
264250
static int avs_card_suspend_pre(struct snd_soc_card *card)
265251
{
266-
return avs_card_set_jack(card, NULL);
252+
struct snd_soc_dai *codec_dai = snd_soc_card_get_codec_dai(card, SKL_NUVOTON_CODEC_DAI);
253+
254+
return snd_soc_component_set_jack(codec_dai->component, NULL, NULL);
267255
}
268256

269257
static int avs_card_resume_post(struct snd_soc_card *card)
@@ -280,7 +268,7 @@ static int avs_card_resume_post(struct snd_soc_card *card)
280268
codec_dai->playback_widget->active)
281269
snd_soc_dai_set_sysclk(codec_dai, NAU8825_CLK_FLL_FS, 0, SND_SOC_CLOCK_IN);
282270

283-
return avs_card_set_jack(card, jack);
271+
return snd_soc_component_set_jack(codec_dai->component, jack, NULL);
284272
}
285273

286274
static int avs_nau8825_probe(struct platform_device *pdev)
@@ -318,7 +306,6 @@ static int avs_nau8825_probe(struct platform_device *pdev)
318306
card->name = "avs_nau8825";
319307
card->dev = dev;
320308
card->owner = THIS_MODULE;
321-
card->remove = avs_card_remove;
322309
card->suspend_pre = avs_card_suspend_pre;
323310
card->resume_post = avs_card_resume_post;
324311
card->dai_link = dai_link;

‎sound/soc/intel/avs/boards/rt274.c

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,11 @@ static int avs_rt274_codec_init(struct snd_soc_pcm_runtime *runtime)
119119
return 0;
120120
}
121121

122+
static void avs_rt274_codec_exit(struct snd_soc_pcm_runtime *rtd)
123+
{
124+
snd_soc_component_set_jack(asoc_rtd_to_codec(rtd, 0)->component, NULL, NULL);
125+
}
126+
122127
static int avs_rt274_be_fixup(struct snd_soc_pcm_runtime *runtime, struct snd_pcm_hw_params *params)
123128
{
124129
struct snd_interval *rate, *channels;
@@ -160,7 +165,7 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
160165

161166
dl->cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d Pin", ssp_port);
162167
dl->codecs->name = devm_kasprintf(dev, GFP_KERNEL, "i2c-INT34C2:00");
163-
dl->codecs->dai_name = devm_kasprintf(dev, GFP_KERNEL, "rt274-aif1");
168+
dl->codecs->dai_name = devm_kasprintf(dev, GFP_KERNEL, RT274_CODEC_DAI);
164169
if (!dl->cpus->dai_name || !dl->codecs->name || !dl->codecs->dai_name)
165170
return -ENOMEM;
166171

@@ -171,6 +176,7 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
171176
dl->id = 0;
172177
dl->dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS;
173178
dl->init = avs_rt274_codec_init;
179+
dl->exit = avs_rt274_codec_exit;
174180
dl->be_hw_params_fixup = avs_rt274_be_fixup;
175181
dl->nonatomic = 1;
176182
dl->no_pcm = 1;
@@ -214,30 +220,19 @@ static int avs_create_dapm_routes(struct device *dev, int ssp_port,
214220
return 0;
215221
}
216222

217-
static int avs_card_set_jack(struct snd_soc_card *card, struct snd_soc_jack *jack)
218-
{
219-
struct snd_soc_component *component;
220-
221-
for_each_card_components(card, component)
222-
snd_soc_component_set_jack(component, jack, NULL);
223-
return 0;
224-
}
225-
226-
static int avs_card_remove(struct snd_soc_card *card)
227-
{
228-
return avs_card_set_jack(card, NULL);
229-
}
230-
231223
static int avs_card_suspend_pre(struct snd_soc_card *card)
232224
{
233-
return avs_card_set_jack(card, NULL);
225+
struct snd_soc_dai *codec_dai = snd_soc_card_get_codec_dai(card, RT274_CODEC_DAI);
226+
227+
return snd_soc_component_set_jack(codec_dai->component, NULL, NULL);
234228
}
235229

236230
static int avs_card_resume_post(struct snd_soc_card *card)
237231
{
232+
struct snd_soc_dai *codec_dai = snd_soc_card_get_codec_dai(card, RT274_CODEC_DAI);
238233
struct snd_soc_jack *jack = snd_soc_card_get_drvdata(card);
239234

240-
return avs_card_set_jack(card, jack);
235+
return snd_soc_component_set_jack(codec_dai->component, jack, NULL);
241236
}
242237

243238
static int avs_rt274_probe(struct platform_device *pdev)
@@ -275,7 +270,6 @@ static int avs_rt274_probe(struct platform_device *pdev)
275270
card->name = "avs_rt274";
276271
card->dev = dev;
277272
card->owner = THIS_MODULE;
278-
card->remove = avs_card_remove;
279273
card->suspend_pre = avs_card_suspend_pre;
280274
card->resume_post = avs_card_resume_post;
281275
card->dai_link = dai_link;

‎sound/soc/intel/avs/boards/rt286.c

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
#include <sound/soc-acpi.h>
1515
#include "../../../codecs/rt286.h"
1616

17+
#define RT286_CODEC_DAI "rt286-aif1"
18+
1719
static const struct snd_kcontrol_new card_controls[] = {
1820
SOC_DAPM_PIN_SWITCH("Headphone Jack"),
1921
SOC_DAPM_PIN_SWITCH("Mic Jack"),
@@ -48,10 +50,9 @@ static struct snd_soc_jack_pin card_headset_pins[] = {
4850

4951
static int avs_rt286_codec_init(struct snd_soc_pcm_runtime *runtime)
5052
{
51-
struct snd_soc_component *component = asoc_rtd_to_codec(runtime, 0)->component;
53+
struct snd_soc_card *card = runtime->card;
5254
struct snd_soc_jack_pin *pins;
5355
struct snd_soc_jack *jack;
54-
struct snd_soc_card *card = runtime->card;
5556
int num_pins, ret;
5657

5758
jack = snd_soc_card_get_drvdata(card);
@@ -66,9 +67,12 @@ static int avs_rt286_codec_init(struct snd_soc_pcm_runtime *runtime)
6667
if (ret)
6768
return ret;
6869

69-
snd_soc_component_set_jack(component, jack, NULL);
70+
return snd_soc_component_set_jack(asoc_rtd_to_codec(runtime, 0)->component, jack, NULL);
71+
}
7072

71-
return 0;
73+
static void avs_rt286_codec_exit(struct snd_soc_pcm_runtime *rtd)
74+
{
75+
snd_soc_component_set_jack(asoc_rtd_to_codec(rtd, 0)->component, NULL, NULL);
7276
}
7377

7478
static int avs_rt286_be_fixup(struct snd_soc_pcm_runtime *runtime, struct snd_pcm_hw_params *params)
@@ -130,7 +134,7 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
130134

131135
dl->cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d Pin", ssp_port);
132136
dl->codecs->name = devm_kasprintf(dev, GFP_KERNEL, "i2c-INT343A:00");
133-
dl->codecs->dai_name = devm_kasprintf(dev, GFP_KERNEL, "rt286-aif1");
137+
dl->codecs->dai_name = devm_kasprintf(dev, GFP_KERNEL, RT286_CODEC_DAI);
134138
if (!dl->cpus->dai_name || !dl->codecs->name || !dl->codecs->dai_name)
135139
return -ENOMEM;
136140

@@ -141,6 +145,7 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in
141145
dl->id = 0;
142146
dl->dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS;
143147
dl->init = avs_rt286_codec_init;
148+
dl->exit = avs_rt286_codec_exit;
144149
dl->be_hw_params_fixup = avs_rt286_be_fixup;
145150
dl->ops = &avs_rt286_ops;
146151
dl->nonatomic = 1;
@@ -185,30 +190,19 @@ static int avs_create_dapm_routes(struct device *dev, int ssp_port,
185190
return 0;
186191
}
187192

188-
static int avs_card_set_jack(struct snd_soc_card *card, struct snd_soc_jack *jack)
189-
{
190-
struct snd_soc_component *component;
191-
192-
for_each_card_components(card, component)
193-
snd_soc_component_set_jack(component, jack, NULL);
194-
return 0;
195-
}
196-
197-
static int avs_card_remove(struct snd_soc_card *card)
198-
{
199-
return avs_card_set_jack(card, NULL);
200-
}
201-
202193
static int avs_card_suspend_pre(struct snd_soc_card *card)
203194
{
204-
return avs_card_set_jack(card, NULL);
195+
struct snd_soc_dai *codec_dai = snd_soc_card_get_codec_dai(card, RT286_CODEC_DAI);
196+
197+
return snd_soc_component_set_jack(codec_dai->component, NULL, NULL);
205198
}
206199

207200
static int avs_card_resume_post(struct snd_soc_card *card)
208201
{
202+
struct snd_soc_dai *codec_dai = snd_soc_card_get_codec_dai(card, RT286_CODEC_DAI);
209203
struct snd_soc_jack *jack = snd_soc_card_get_drvdata(card);
210204

211-
return avs_card_set_jack(card, jack);
205+
return snd_soc_component_set_jack(codec_dai->component, jack, NULL);
212206
}
213207

214208
static int avs_rt286_probe(struct platform_device *pdev)
@@ -246,7 +240,6 @@ static int avs_rt286_probe(struct platform_device *pdev)
246240
card->name = "avs_rt286";
247241
card->dev = dev;
248242
card->owner = THIS_MODULE;
249-
card->remove = avs_card_remove;
250243
card->suspend_pre = avs_card_suspend_pre;
251244
card->resume_post = avs_card_resume_post;
252245
card->dai_link = dai_link;

0 commit comments

Comments
 (0)