Skip to content

Commit 2230c49

Browse files
charleskeepaxbroonie
authored andcommitted
ASoC: arizona: Add a notifier chain for CODEC events
Add a notifier chain that can be used from the machine driver to catch events generated by the CODEC. Signed-off-by: Charles Keepax <[email protected]> Signed-off-by: Mark Brown <[email protected]>
1 parent 1a695a9 commit 2230c49

File tree

5 files changed

+57
-0
lines changed

5 files changed

+57
-0
lines changed

include/linux/mfd/arizona/core.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#define _WM_ARIZONA_CORE_H
1515

1616
#include <linux/interrupt.h>
17+
#include <linux/notifier.h>
1718
#include <linux/regmap.h>
1819
#include <linux/regulator/consumer.h>
1920
#include <linux/mfd/arizona/pdata.h>
@@ -148,8 +149,17 @@ struct arizona {
148149
uint16_t dac_comp_coeff;
149150
uint8_t dac_comp_enabled;
150151
struct mutex dac_comp_lock;
152+
153+
struct blocking_notifier_head notifier;
151154
};
152155

156+
static inline int arizona_call_notifiers(struct arizona *arizona,
157+
unsigned long event,
158+
void *data)
159+
{
160+
return blocking_notifier_call_chain(&arizona->notifier, event, data);
161+
}
162+
153163
int arizona_clk32k_enable(struct arizona *arizona);
154164
int arizona_clk32k_disable(struct arizona *arizona);
155165

sound/soc/codecs/arizona.c

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,17 @@ int arizona_init_gpio(struct snd_soc_codec *codec)
324324
}
325325
EXPORT_SYMBOL_GPL(arizona_init_gpio);
326326

327+
int arizona_init_notifiers(struct snd_soc_codec *codec)
328+
{
329+
struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);
330+
struct arizona *arizona = priv->arizona;
331+
332+
BLOCKING_INIT_NOTIFIER_HEAD(&arizona->notifier);
333+
334+
return 0;
335+
}
336+
EXPORT_SYMBOL_GPL(arizona_init_notifiers);
337+
327338
const char * const arizona_mixer_texts[ARIZONA_NUM_MIXER_INPUTS] = {
328339
"None",
329340
"Tone Generator 1",
@@ -2573,6 +2584,30 @@ int arizona_lhpf_coeff_put(struct snd_kcontrol *kcontrol,
25732584
}
25742585
EXPORT_SYMBOL_GPL(arizona_lhpf_coeff_put);
25752586

2587+
int arizona_register_notifier(struct snd_soc_codec *codec,
2588+
struct notifier_block *nb,
2589+
int (*notify)(struct notifier_block *nb,
2590+
unsigned long action, void *data))
2591+
{
2592+
struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);
2593+
struct arizona *arizona = priv->arizona;
2594+
2595+
nb->notifier_call = notify;
2596+
2597+
return blocking_notifier_chain_register(&arizona->notifier, nb);
2598+
}
2599+
EXPORT_SYMBOL_GPL(arizona_register_notifier);
2600+
2601+
int arizona_unregister_notifier(struct snd_soc_codec *codec,
2602+
struct notifier_block *nb)
2603+
{
2604+
struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);
2605+
struct arizona *arizona = priv->arizona;
2606+
2607+
return blocking_notifier_chain_unregister(&arizona->notifier, nb);
2608+
}
2609+
EXPORT_SYMBOL_GPL(arizona_unregister_notifier);
2610+
25762611
MODULE_DESCRIPTION("ASoC Wolfson Arizona class device support");
25772612
MODULE_AUTHOR("Mark Brown <[email protected]>");
25782613
MODULE_LICENSE("GPL");

sound/soc/codecs/arizona.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,7 @@ extern int arizona_set_fll(struct arizona_fll *fll, int source,
306306
extern int arizona_init_spk(struct snd_soc_codec *codec);
307307
extern int arizona_init_gpio(struct snd_soc_codec *codec);
308308
extern int arizona_init_mono(struct snd_soc_codec *codec);
309+
extern int arizona_init_notifiers(struct snd_soc_codec *codec);
309310

310311
extern int arizona_free_spk(struct snd_soc_codec *codec);
311312

@@ -317,4 +318,13 @@ int arizona_set_output_mode(struct snd_soc_codec *codec, int output,
317318
extern bool arizona_input_analog(struct snd_soc_codec *codec, int shift);
318319

319320
extern const char *arizona_sample_rate_val_to_name(unsigned int rate_val);
321+
322+
extern int arizona_register_notifier(struct snd_soc_codec *codec,
323+
struct notifier_block *nb,
324+
int (*notify)(struct notifier_block *nb,
325+
unsigned long action,
326+
void *data));
327+
extern int arizona_unregister_notifier(struct snd_soc_codec *codec,
328+
struct notifier_block *nb);
329+
320330
#endif

sound/soc/codecs/cs47l24.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,6 +1096,7 @@ static int cs47l24_codec_probe(struct snd_soc_codec *codec)
10961096
arizona_init_spk(codec);
10971097
arizona_init_gpio(codec);
10981098
arizona_init_mono(codec);
1099+
arizona_init_notifiers(codec);
10991100

11001101
ret = arizona_request_irq(arizona, ARIZONA_IRQ_DSP_IRQ1,
11011102
"ADSP2 Compressed IRQ", cs47l24_adsp2_irq,

sound/soc/codecs/wm5110.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2251,6 +2251,7 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec)
22512251
arizona_init_spk(codec);
22522252
arizona_init_gpio(codec);
22532253
arizona_init_mono(codec);
2254+
arizona_init_notifiers(codec);
22542255

22552256
ret = arizona_request_irq(arizona, ARIZONA_IRQ_DSP_IRQ1,
22562257
"ADSP2 Compressed IRQ", wm5110_adsp2_irq,

0 commit comments

Comments
 (0)