| Message ID | 1416400568-7512-1-git-send-email-b50113@freescale.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Nov 19, 2014 at 10:36 AM, Zidan Wang <b50113@freescale.com> wrote: > wm8960 codec has a wm8960_data struct which has two fields shared_lrclk and capless. > The wm8960_data is get from platform_data and it is reasonable to set it from device > tree when platform_data is null. > And when shared_lrclk is set, LRCM will be enabled. But the following software reset > in wm8960_probe will reset it to the default state. So LRCM operation should after > software reset. > > Signed-off-by: Zidan Wang <b50113@freescale.com> > --- > sound/soc/codecs/wm8960.c | 49 ++++++++++++++++++++++++++++++----------------- I think you could a add Documentation/devicetree/bindings/sound/wm8960.txt in a separate patch and document these properties there.
On Wed, Nov 19, 2014 at 08:36:08PM +0800, Zidan Wang wrote: > wm8960 codec has a wm8960_data struct which has two fields shared_lrclk and capless. Please ensure your changelog is wrapped within 80 columns. > --- > sound/soc/codecs/wm8960.c | 49 ++++++++++++++++++++++++++++++----------------- > 1 file changed, 31 insertions(+), 18 deletions(-) Any DT bindings need to have a bindings document as well.
On Wed, Nov 19, 2014 at 08:36:08PM +0800, Zidan Wang wrote: > wm8960 codec has a wm8960_data struct which has two fields shared_lrclk and capless. > The wm8960_data is get from platform_data and it is reasonable to set it from device > tree when platform_data is null. > And when shared_lrclk is set, LRCM will be enabled. But the following software reset > in wm8960_probe will reset it to the default state. So LRCM operation should after > software reset. > > Signed-off-by: Zidan Wang <b50113@freescale.com> > --- > sound/soc/codecs/wm8960.c | 49 ++++++++++++++++++++++++++++++----------------- > 1 file changed, 31 insertions(+), 18 deletions(-) > > diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c > index 4dc4e85..1d56c90 100644 > --- a/sound/soc/codecs/wm8960.c > +++ b/sound/soc/codecs/wm8960.c > @@ -1038,6 +1055,7 @@ static int wm8960_i2c_probe(struct i2c_client *i2c, > > wm8960 = devm_kzalloc(&i2c->dev, sizeof(struct wm8960_priv), > GFP_KERNEL); > + > if (wm8960 == NULL) > return -ENOMEM; Extra blank line accidentally being added here. Also I would probably make the shifting of the shared_lrclk handling a different patch as that is a bug fix and shouldn't really be tided into a patch adding DT bindings. As pointed out this will need a corresponding DT documentaion patch, but apart from those things looks good to me. Thanks, Charles
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index 4dc4e85..1d56c90 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -125,6 +125,7 @@ struct wm8960_priv { struct snd_soc_dapm_widget *out3; bool deemph; int playback_fs; + struct wm8960_data pdata; }; #define wm8960_reset(c) snd_soc_write(c, WM8960_RESET, 0) @@ -961,17 +962,13 @@ static int wm8960_resume(struct snd_soc_codec *codec) static int wm8960_probe(struct snd_soc_codec *codec) { struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec); - struct wm8960_data *pdata = dev_get_platdata(codec->dev); + struct wm8960_data *pdata = &wm8960->pdata; int ret; - wm8960->set_bias_level = wm8960_set_bias_level_out3; - - if (!pdata) { - dev_warn(codec->dev, "No platform data supplied\n"); - } else { - if (pdata->capless) - wm8960->set_bias_level = wm8960_set_bias_level_capless; - } + if (pdata->capless) + wm8960->set_bias_level = wm8960_set_bias_level_capless; + else + wm8960->set_bias_level = wm8960_set_bias_level_out3; ret = wm8960_reset(codec); if (ret < 0) { @@ -979,6 +976,14 @@ static int wm8960_probe(struct snd_soc_codec *codec) return ret; } + if (pdata->shared_lrclk) { + ret = snd_soc_update_bits(codec, WM8960_ADDCTL2, 0x4, 0x4); + if (ret < 0) { + dev_err(codec->dev, "Failed to enable LRCM: %d\n", ret); + return ret; + } + } + wm8960->set_bias_level(codec, SND_SOC_BIAS_STANDBY); /* Latch the update bits */ @@ -1029,6 +1034,18 @@ static const struct regmap_config wm8960_regmap = { .volatile_reg = wm8960_volatile, }; +static void wm8960_set_pdata_from_of(struct i2c_client *i2c, + struct wm8960_data *pdata) +{ + const struct device_node *np = i2c->dev.of_node; + + if (of_property_read_bool(np, "capless")) + pdata->capless = true; + + if (of_property_read_bool(np, "shared_lrclk")) + pdata->shared_lrclk = true; +} + static int wm8960_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { @@ -1038,6 +1055,7 @@ static int wm8960_i2c_probe(struct i2c_client *i2c, wm8960 = devm_kzalloc(&i2c->dev, sizeof(struct wm8960_priv), GFP_KERNEL); + if (wm8960 == NULL) return -ENOMEM; @@ -1045,15 +1063,10 @@ static int wm8960_i2c_probe(struct i2c_client *i2c, if (IS_ERR(wm8960->regmap)) return PTR_ERR(wm8960->regmap); - if (pdata && pdata->shared_lrclk) { - ret = regmap_update_bits(wm8960->regmap, WM8960_ADDCTL2, - 0x4, 0x4); - if (ret != 0) { - dev_err(&i2c->dev, "Failed to enable LRCM: %d\n", - ret); - return ret; - } - } + if (pdata) + memcpy(&wm8960->pdata, pdata, sizeof(struct wm8960_data)); + else if (i2c->dev.of_node) + wm8960_set_pdata_from_of(i2c, &wm8960->pdata); i2c_set_clientdata(i2c, wm8960);
wm8960 codec has a wm8960_data struct which has two fields shared_lrclk and capless. The wm8960_data is get from platform_data and it is reasonable to set it from device tree when platform_data is null. And when shared_lrclk is set, LRCM will be enabled. But the following software reset in wm8960_probe will reset it to the default state. So LRCM operation should after software reset. Signed-off-by: Zidan Wang <b50113@freescale.com> --- sound/soc/codecs/wm8960.c | 49 ++++++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 18 deletions(-)