ASoC: wm8962: Let CODEC driver enable and disable its own MCLK
Subsystems (3)
PATCH v2 1/1 ASoC: wm8962: Let CODEC driver enable and disable its own MCLK
snd_soc_open() will trigger pm_runtime resume() which will then enable the regulator and initialization. So we should make sure the MCLK is enabled before this resume().
Previously we let the machine driver get the clock and enable it in its probe(). However, considering about power saving, it'll be better to enable it when it's going to be used and disable it after using.
So this patch just simply adds clk_get() and clk_enable() to WM8962 driver. Meanwhile, it marks clock pointer to NULL if no clock assigned to it so it will not break any current function.
---
Changelog:
v2
* Use wm8962->pdata.mclk instead.
include/sound/wm8962.h | 1 + sound/soc/codecs/wm8962.c | 11 +++++++++++ 2 files changed, 12 insertions(+)
include/sound/wm8962.h +1 -0
@@ -37,6 +37,7 @@#define WM8962_GPIO_FN_MICSCD 22struct wm8962_pdata { +struct clk *mclk;int gpio_base;u32 gpio_init[WM8962_MAX_GPIO ];
sound/soc/codecs/wm8962.c +11 -0
@@ -14,6 +14,7 @@#include <linux/module.h> #include <linux/moduleparam.h> #include <linux/init.h> +#include <linux/clk.h> #include <linux/delay.h> #include <linux/pm.h> #include <linux/gcd.h>
@@ -3541,6 +3542,8 @@ static int wm8962_set_pdata_from_of(struct i2c_client *i2c, pdata->gpio_init[i] =0x0 ; } + pdata->mclk =devm_clk_get (&i2c->dev,NULL ); +return 0 ; }
@@ -3572,6 +3575,10 @@ static int wm8962_i2c_probe(struct i2c_client *i2c,return ret; } +/* Mark the mclk pointer to NULL if no mclk assigned */ +if (IS_ERR (wm8962->pdata.mclk)) + wm8962->pdata.mclk =NULL ; +for (i =0 ; i <ARRAY_SIZE (wm8962->supplies); i++) wm8962->supplies[i].supply = wm8962_supply_names[i];
@@ -3780,6 +3787,8 @@ static int wm8962_runtime_resume(struct device *dev)struct wm8962_priv *wm8962 =dev_get_drvdata (dev);int ret; +clk_prepare_enable (wm8962->pdata.mclk); + ret =regulator_bulk_enable (ARRAY_SIZE (wm8962->supplies), wm8962->supplies);if (ret !=0 ) {
@@ -3839,6 +3848,8 @@ static int wm8962_runtime_suspend(struct device *dev)regulator_bulk_disable (ARRAY_SIZE (wm8962->supplies), wm8962->supplies); +clk_disable_unprepare (wm8962->pdata.mclk); + return 0; }#endif
Signature · 1 line
1.8.4
Mark Brown
maintainersound/soc/codecs/wm8962.c static int wm8962_set_pdata_from_of(struct i2c_client *i2c, · line 3546
Quoted 2 lines · Nicolin Chen
sound/soc/codecs/wm8962.c +2
-0+ pdata->mclk =devm_clk_get (&i2c->dev,NULL ); +
This is broken for deferred probe.
sound/soc/codecs/wm8962.c static int wm8962_runtime_resume(struct device *dev) · line 3791
Quoted 2 lines
sound/soc/codecs/wm8962.c +2
-0+clk_prepare_enable (wm8962->pdata.mclk); +
Missing error checking.
Hi Nicolin,
Quoted 6 lines · Mark Brown
sound/soc/codecs/wm8962.c static int wm8962_set_pdata_from_of(struct i2c_client *i2c, · line 3546
Quoted 2 lines · Nicolin Chen
sound/soc/codecs/wm8962.c +2
-0+ pdata->mclk =devm_clk_get (&i2c->dev,NULL ); +This is broken for deferred probe.
You can take a look at sgtl5000 to see how we handle deferred probe in devm_clk_get().
Quoted 9 lines · Fabio Estevam
Hi Nicolin,
Quoted 6 lines · Mark Brown
sound/soc/codecs/wm8962.c static int wm8962_set_pdata_from_of(struct i2c_client *i2c, · line 3546
Quoted 2 lines · Nicolin Chen
sound/soc/codecs/wm8962.c +2
-0+ pdata->mclk =devm_clk_get (&i2c->dev,NULL ); +This is broken for deferred probe.
Hi Mark,
Sorry. I don't get why deferred probe would be broken by this. And I just took a test by adding this:
[...]
@@ -3545,10 +3545,11 @@ static int wm8962_set_pdata_from_of(struct i2c_client *i2c,
}
+bool letstry = true;
static int wm8962_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
@@ -3573,10 +3574,15 @@ static int wm8962_i2c_probe(struct i2c_client *i2c,
ret = wm8962_set_pdata_from_of(i2c, &wm8962->pdata); if (ret != 0) return ret; }
+ if (letstry) {
+ letstry = false;
+ return -EPROBE_DEFER;
+ }
/* Mark the mclk pointer to NULL if no mclk assigned */ if (IS_ERR(wm8962->pdata.mclk)) wm8962->pdata.mclk = NULL;
[...]
And it still works for me with a deferred probe:
[] i2c 0-001a: Driver wm8962 requests probe deferral []...
[]wm8962 0-001a: customer id 0 revision D
[]input: WM8962 Beep Generator as /devices/soc0/soc/2100000...... []fsl-asoc-card sound: wm8962 <-> 202c000.ssi mapping ok
Quoted 3 lines
You can take a look at sgtl5000 to see how we handle deferred probe in
devm_clk_get().
Hi Fabio,
Thank you for the hint.
But actually, unlike sgtl5000, this patch doesn't error out for IS_ERR(mclk) case.
There might be a machine driver that has already got and enabled the clock while getting the clock from other way or other DT node rather than WM8962's.
Thank you.
Nicolin
Mark Brown
maintainerQuoted 8 lines · Nicolin Chen
Quoted 3 lines · Fabio Estevam
Quoted 3 lines
Quoted 1 line
+
pdata->mclk=devm_clk_get(&i2c->dev, NULL);This is broken for deferred probe.
Sorry. I don't get why deferred probe would be broken by this. And I just took a test by adding this:
I don't see the code that actually pays attention to the return value from devm_clk_get() - in the main probe function the code just treats all errors as a missing MCLK.
Quoted 5 lines · Mark Brown
Quoted 3 lines · Nicolin Chen
Quoted 1 line · Fabio Estevam
Quoted 1 line
Quoted 1 line
+
pdata->mclk=devm_clk_get(&i2c->dev, NULL);
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
Quoted 1 line
This is broken for deferred probe.
Sorry. I don't get why deferred probe would be broken by this. And I just took a test by adding this:
I don't see the code that actually pays attention to the return value from
devm_clk_get()- in the main probe function the code just treats all errors as a missing MCLK.
Just checked the clk_get() code and got the point.
I will add a check to it and return for EPROBE_DEFER.
Thank you,
Nicolin