| Message ID | 87oaeud01r.wl%kuninori.morimoto.gx@renesas.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a3af0c65836e714fa71dcaa0a81f6db83a212faa |
| Headers | show |
On 11/16/2015 05:51 AM, Kuninori Morimoto wrote: > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > ak4613 IN/OUT pin can be selected as differential/single-end. > Default is differential, because it is register default settings. > > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > --- > v1 -> v2 > > - add vender prefix > > Documentation/devicetree/bindings/sound/ak4613.txt | 10 ++++++++ > sound/soc/codecs/ak4613.c | 29 ++++++++++++++++++++++ > 2 files changed, 39 insertions(+) > > diff --git a/Documentation/devicetree/bindings/sound/ak4613.txt b/Documentation/devicetree/bindings/sound/ak4613.txt > index 15a9195..3cf63e7 100644 > --- a/Documentation/devicetree/bindings/sound/ak4613.txt > +++ b/Documentation/devicetree/bindings/sound/ak4613.txt > @@ -7,6 +7,16 @@ Required properties: > - compatible : "asahi-kasei,ak4613" > - reg : The chip select number on the I2C bus > > +Optional properties: > +- ak4613,in1-single-end : Boolean. Indicate input / output pins are single-ended. > +- ak4613,in2-single-end rather than differential. > +- ak4613,out1-single-end > +- ak4613,out2-single-end > +- ak4613,out3-single-end > +- ak4613,out4-single-end > +- ak4613,out5-single-end > +- ak4613,out6-single-end The vendor prefix is usually the same as for the compatible string, rather than the part name. E.g. in this case asahi-kasei.
Hi Lars > > +Optional properties: > > +- ak4613,in1-single-end : Boolean. Indicate input / output pins are single-ended. > > +- ak4613,in2-single-end rather than differential. > > +- ak4613,out1-single-end > > +- ak4613,out2-single-end > > +- ak4613,out3-single-end > > +- ak4613,out4-single-end > > +- ak4613,out5-single-end > > +- ak4613,out6-single-end > > The vendor prefix is usually the same as for the compatible string, rather > than the part name. E.g. in this case asahi-kasei. Thanks This patch is already applied, will post additional fixup patch
diff --git a/Documentation/devicetree/bindings/sound/ak4613.txt b/Documentation/devicetree/bindings/sound/ak4613.txt index 15a9195..3cf63e7 100644 --- a/Documentation/devicetree/bindings/sound/ak4613.txt +++ b/Documentation/devicetree/bindings/sound/ak4613.txt @@ -7,6 +7,16 @@ Required properties: - compatible : "asahi-kasei,ak4613" - reg : The chip select number on the I2C bus +Optional properties: +- ak4613,in1-single-end : Boolean. Indicate input / output pins are single-ended. +- ak4613,in2-single-end rather than differential. +- ak4613,out1-single-end +- ak4613,out2-single-end +- ak4613,out3-single-end +- ak4613,out4-single-end +- ak4613,out5-single-end +- ak4613,out6-single-end + Example: &i2c { diff --git a/sound/soc/codecs/ak4613.c b/sound/soc/codecs/ak4613.c index 07a2664..394c10f 100644 --- a/sound/soc/codecs/ak4613.c +++ b/sound/soc/codecs/ak4613.c @@ -79,6 +79,8 @@ struct ak4613_priv { unsigned int fmt; u8 fmt_ctrl; + u8 oc; + u8 ic; int cnt; }; @@ -343,6 +345,9 @@ static int ak4613_dai_hw_params(struct snd_pcm_substream *substream, snd_soc_update_bits(codec, CTRL1, FMT_MASK, fmt_ctrl); snd_soc_write(codec, CTRL2, ctrl2); + snd_soc_write(codec, ICTRL, priv->ic); + snd_soc_write(codec, OCTRL, priv->oc); + hw_params_end: if (ret < 0) dev_warn(dev, "unsupported data width/format combination\n"); @@ -431,6 +436,28 @@ static struct snd_soc_codec_driver soc_codec_dev_ak4613 = { .num_dapm_routes = ARRAY_SIZE(ak4613_intercon), }; +static void ak4613_parse_of(struct ak4613_priv *priv, + struct device *dev) +{ + struct device_node *np = dev->of_node; + char prop[32]; + int i; + + /* Input 1 - 2 */ + for (i = 0; i < 2; i++) { + snprintf(prop, sizeof(prop), "ak4613,in%d-single-end", i + 1); + if (!of_get_property(np, prop, NULL)) + priv->ic |= 1 << i; + } + + /* Output 1 - 6 */ + for (i = 0; i < 6; i++) { + snprintf(prop, sizeof(prop), "ak4613,out%d-single-end", i + 1); + if (!of_get_property(np, prop, NULL)) + priv->oc |= 1 << i; + } +} + static int ak4613_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { @@ -458,6 +485,8 @@ static int ak4613_i2c_probe(struct i2c_client *i2c, if (!priv) return -ENOMEM; + ak4613_parse_of(priv, dev); + priv->fmt_ctrl = NO_FMT; priv->cnt = 0;