* [PATCH v2 2/4] ASoC: tlv320aic32x4: DT support [not found] <1390219558-25341-1-git-send-email-mpa@pengutronix.de> @ 2014-01-20 12:05 ` Markus Pargmann 2014-01-20 12:54 ` Philipp Zabel [not found] ` <1390219558-25341-1-git-send-email-mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 1 sibling, 1 reply; 4+ messages in thread From: Markus Pargmann @ 2014-01-20 12:05 UTC (permalink / raw) To: Mark Brown Cc: Mark Rutland, devicetree, alsa-devel, Lars-Peter Clausen, Pawel Moll, Ian Campbell, Liam Girdwood, Rob Herring, kernel, Kumar Gala, Markus Pargmann Add DT support for this codec. The bindings differ a bit from the aic3x codec bindings, so I created a new binding documentation. Cc: Rob Herring <robh+dt@kernel.org> Cc: Pawel Moll <pawel.moll@arm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Ian Campbell <ijc+devicetree@hellion.org.uk> Cc: Kumar Gala <galak@codeaurora.org> Cc: devicetree@vger.kernel.org Signed-off-by: Markus Pargmann <mpa@pengutronix.de> --- .../devicetree/bindings/sound/tlv320aic32x4.txt | 18 ++++++++++++++++ sound/soc/codecs/tlv320aic32x4.c | 25 ++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/tlv320aic32x4.txt diff --git a/Documentation/devicetree/bindings/sound/tlv320aic32x4.txt b/Documentation/devicetree/bindings/sound/tlv320aic32x4.txt new file mode 100644 index 0000000..cff06ea --- /dev/null +++ b/Documentation/devicetree/bindings/sound/tlv320aic32x4.txt @@ -0,0 +1,18 @@ +Texas Instruments - tlv320aic32x4 Codec module + +The tlv320aic32x4 serial control bus communicates through I2C protocols + +Required properties: + - compatible: Should be "ti,tlv320aic32x4" + - reg: I2C slave address + +Optional properties: + - gpio-reset: Reset-GPIO phandle with args as described in gpio/gpio.txt + + +Example: + +codec: tlv320aic32x4@18 { + compatible = "ti,tlv320aic32x4"; + reg = <0x18>; +}; diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c index 1c9f1d8..6c38cb7 100644 --- a/sound/soc/codecs/tlv320aic32x4.c +++ b/sound/soc/codecs/tlv320aic32x4.c @@ -29,6 +29,7 @@ #include <linux/delay.h> #include <linux/pm.h> #include <linux/gpio.h> +#include <linux/of_gpio.h> #include <linux/i2c.h> #include <linux/cdev.h> #include <linux/slab.h> @@ -669,11 +670,22 @@ static struct snd_soc_codec_driver soc_codec_dev_aic32x4 = { .num_dapm_routes = ARRAY_SIZE(aic32x4_dapm_routes), }; +static int aic32x4_parse_dt(struct aic32x4_priv *aic32x4, + struct device_node *np) +{ + aic32x4->swapdacs = false; + aic32x4->micpga_routing = 0; + aic32x4->rstn_gpio = of_get_named_gpio(np, "gpio-reset", 0); + + return 0; +} + static int aic32x4_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { struct aic32x4_pdata *pdata = i2c->dev.platform_data; struct aic32x4_priv *aic32x4; + struct device_node *np = i2c->dev.of_node; int ret; aic32x4 = devm_kzalloc(&i2c->dev, sizeof(struct aic32x4_priv), @@ -692,6 +704,12 @@ static int aic32x4_i2c_probe(struct i2c_client *i2c, aic32x4->swapdacs = pdata->swapdacs; aic32x4->micpga_routing = pdata->micpga_routing; aic32x4->rstn_gpio = pdata->rstn_gpio; + } else if (np) { + ret = aic32x4_parse_dt(aic32x4, np); + if (ret) { + dev_err(&i2c->dev, "Failed to parse DT node\n"); + return ret; + } } else { aic32x4->power_cfg = 0; aic32x4->swapdacs = false; @@ -723,10 +741,17 @@ static const struct i2c_device_id aic32x4_i2c_id[] = { }; MODULE_DEVICE_TABLE(i2c, aic32x4_i2c_id); +static const struct of_device_id aic32x4_of_id[] = { + { .compatible = "ti,tlv320aic32x4", }, + { /* senitel */ } +}; +MODULE_DEVICE_TABLE(of, aic32x4_of_id); + static struct i2c_driver aic32x4_i2c_driver = { .driver = { .name = "tlv320aic32x4", .owner = THIS_MODULE, + .of_match_table = aic32x4_of_id, }, .probe = aic32x4_i2c_probe, .remove = aic32x4_i2c_remove, -- 1.8.5.2 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 2/4] ASoC: tlv320aic32x4: DT support 2014-01-20 12:05 ` [PATCH v2 2/4] ASoC: tlv320aic32x4: DT support Markus Pargmann @ 2014-01-20 12:54 ` Philipp Zabel 2014-01-20 12:58 ` Markus Pargmann 0 siblings, 1 reply; 4+ messages in thread From: Philipp Zabel @ 2014-01-20 12:54 UTC (permalink / raw) To: Markus Pargmann Cc: Mark Rutland, devicetree, alsa-devel, Lars-Peter Clausen, Pawel Moll, Ian Campbell, Mark Brown, Liam Girdwood, Rob Herring, kernel, Kumar Gala Am Montag, den 20.01.2014, 13:05 +0100 schrieb Markus Pargmann: > Add DT support for this codec. The bindings differ a bit from the aic3x > codec bindings, so I created a new binding documentation. > > Cc: Rob Herring <robh+dt@kernel.org> > Cc: Pawel Moll <pawel.moll@arm.com> > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: Ian Campbell <ijc+devicetree@hellion.org.uk> > Cc: Kumar Gala <galak@codeaurora.org> > Cc: devicetree@vger.kernel.org > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> > --- > .../devicetree/bindings/sound/tlv320aic32x4.txt | 18 ++++++++++++++++ > sound/soc/codecs/tlv320aic32x4.c | 25 ++++++++++++++++++++++ > 2 files changed, 43 insertions(+) > create mode 100644 Documentation/devicetree/bindings/sound/tlv320aic32x4.txt > > diff --git a/Documentation/devicetree/bindings/sound/tlv320aic32x4.txt b/Documentation/devicetree/bindings/sound/tlv320aic32x4.txt > new file mode 100644 > index 0000000..cff06ea > --- /dev/null > +++ b/Documentation/devicetree/bindings/sound/tlv320aic32x4.txt > @@ -0,0 +1,18 @@ > +Texas Instruments - tlv320aic32x4 Codec module > + > +The tlv320aic32x4 serial control bus communicates through I2C protocols > + > +Required properties: > + - compatible: Should be "ti,tlv320aic32x4" > + - reg: I2C slave address > + > +Optional properties: > + - gpio-reset: Reset-GPIO phandle with args as described in gpio/gpio.txt This should be "reset-gpios". > + > + > +Example: > + > +codec: tlv320aic32x4@18 { > + compatible = "ti,tlv320aic32x4"; > + reg = <0x18>; > +}; > diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c > index 1c9f1d8..6c38cb7 100644 > --- a/sound/soc/codecs/tlv320aic32x4.c > +++ b/sound/soc/codecs/tlv320aic32x4.c > @@ -29,6 +29,7 @@ > #include <linux/delay.h> > #include <linux/pm.h> > #include <linux/gpio.h> > +#include <linux/of_gpio.h> > #include <linux/i2c.h> > #include <linux/cdev.h> > #include <linux/slab.h> > @@ -669,11 +670,22 @@ static struct snd_soc_codec_driver soc_codec_dev_aic32x4 = { > .num_dapm_routes = ARRAY_SIZE(aic32x4_dapm_routes), > }; > > +static int aic32x4_parse_dt(struct aic32x4_priv *aic32x4, > + struct device_node *np) > +{ > + aic32x4->swapdacs = false; > + aic32x4->micpga_routing = 0; > + aic32x4->rstn_gpio = of_get_named_gpio(np, "gpio-reset", 0); This should be "reset-gpios". > + > + return 0; > +} > + > static int aic32x4_i2c_probe(struct i2c_client *i2c, > const struct i2c_device_id *id) > { > struct aic32x4_pdata *pdata = i2c->dev.platform_data; > struct aic32x4_priv *aic32x4; > + struct device_node *np = i2c->dev.of_node; > int ret; > > aic32x4 = devm_kzalloc(&i2c->dev, sizeof(struct aic32x4_priv), > @@ -692,6 +704,12 @@ static int aic32x4_i2c_probe(struct i2c_client *i2c, > aic32x4->swapdacs = pdata->swapdacs; > aic32x4->micpga_routing = pdata->micpga_routing; > aic32x4->rstn_gpio = pdata->rstn_gpio; > + } else if (np) { > + ret = aic32x4_parse_dt(aic32x4, np); > + if (ret) { > + dev_err(&i2c->dev, "Failed to parse DT node\n"); > + return ret; > + } > } else { > aic32x4->power_cfg = 0; > aic32x4->swapdacs = false; > @@ -723,10 +741,17 @@ static const struct i2c_device_id aic32x4_i2c_id[] = { > }; > MODULE_DEVICE_TABLE(i2c, aic32x4_i2c_id); > > +static const struct of_device_id aic32x4_of_id[] = { > + { .compatible = "ti,tlv320aic32x4", }, > + { /* senitel */ } > +}; > +MODULE_DEVICE_TABLE(of, aic32x4_of_id); > + > static struct i2c_driver aic32x4_i2c_driver = { > .driver = { > .name = "tlv320aic32x4", > .owner = THIS_MODULE, > + .of_match_table = aic32x4_of_id, > }, > .probe = aic32x4_i2c_probe, > .remove = aic32x4_i2c_remove, regards Philipp ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 2/4] ASoC: tlv320aic32x4: DT support 2014-01-20 12:54 ` Philipp Zabel @ 2014-01-20 12:58 ` Markus Pargmann 0 siblings, 0 replies; 4+ messages in thread From: Markus Pargmann @ 2014-01-20 12:58 UTC (permalink / raw) To: Philipp Zabel Cc: Mark Rutland, devicetree, alsa-devel, Lars-Peter Clausen, Pawel Moll, Ian Campbell, Mark Brown, Liam Girdwood, Rob Herring, kernel, Kumar Gala On Mon, Jan 20, 2014 at 01:54:57PM +0100, Philipp Zabel wrote: > Am Montag, den 20.01.2014, 13:05 +0100 schrieb Markus Pargmann: > > Add DT support for this codec. The bindings differ a bit from the aic3x > > codec bindings, so I created a new binding documentation. > > > > Cc: Rob Herring <robh+dt@kernel.org> > > Cc: Pawel Moll <pawel.moll@arm.com> > > Cc: Mark Rutland <mark.rutland@arm.com> > > Cc: Ian Campbell <ijc+devicetree@hellion.org.uk> > > Cc: Kumar Gala <galak@codeaurora.org> > > Cc: devicetree@vger.kernel.org > > Signed-off-by: Markus Pargmann <mpa@pengutronix.de> > > --- > > .../devicetree/bindings/sound/tlv320aic32x4.txt | 18 ++++++++++++++++ > > sound/soc/codecs/tlv320aic32x4.c | 25 ++++++++++++++++++++++ > > 2 files changed, 43 insertions(+) > > create mode 100644 Documentation/devicetree/bindings/sound/tlv320aic32x4.txt > > > > diff --git a/Documentation/devicetree/bindings/sound/tlv320aic32x4.txt b/Documentation/devicetree/bindings/sound/tlv320aic32x4.txt > > new file mode 100644 > > index 0000000..cff06ea > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/sound/tlv320aic32x4.txt > > @@ -0,0 +1,18 @@ > > +Texas Instruments - tlv320aic32x4 Codec module > > + > > +The tlv320aic32x4 serial control bus communicates through I2C protocols > > + > > +Required properties: > > + - compatible: Should be "ti,tlv320aic32x4" > > + - reg: I2C slave address > > + > > +Optional properties: > > + - gpio-reset: Reset-GPIO phandle with args as described in gpio/gpio.txt > > This should be "reset-gpios". Thanks, I will fix it for v3. Regards, Markus -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | ^ permalink raw reply [flat|nested] 4+ messages in thread
[parent not found: <1390219558-25341-1-git-send-email-mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>]
* [PATCH v2 3/4] ASoC: tlv320aic32x4: Support for master clock [not found] ` <1390219558-25341-1-git-send-email-mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> @ 2014-01-20 12:05 ` Markus Pargmann 0 siblings, 0 replies; 4+ messages in thread From: Markus Pargmann @ 2014-01-20 12:05 UTC (permalink / raw) To: Mark Brown Cc: Liam Girdwood, Lars-Peter Clausen, alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw, kernel-bIcnvbaLZ9MEGnE8C9+IrQ, Markus Pargmann, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, devicetree-u79uwXL29TY76Z2rM5mHXA Add support for a master clock passed through DT. The master clock of the codec is only active when the codec is in use. Cc: Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> Cc: Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org> Cc: Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> Cc: Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org> Cc: Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Signed-off-by: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> --- .../devicetree/bindings/sound/tlv320aic32x4.txt | 4 ++++ sound/soc/codecs/tlv320aic32x4.c | 23 ++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/tlv320aic32x4.txt b/Documentation/devicetree/bindings/sound/tlv320aic32x4.txt index cff06ea..e90e6f0 100644 --- a/Documentation/devicetree/bindings/sound/tlv320aic32x4.txt +++ b/Documentation/devicetree/bindings/sound/tlv320aic32x4.txt @@ -8,6 +8,8 @@ Required properties: Optional properties: - gpio-reset: Reset-GPIO phandle with args as described in gpio/gpio.txt + - clocks/clock-names: Clock named 'mclk' for the master clock of the codec. + See clock/clock-bindings.txt for information about the detailed format. Example: @@ -15,4 +17,6 @@ Example: codec: tlv320aic32x4@18 { compatible = "ti,tlv320aic32x4"; reg = <0x18>; + clocks = <&clks 201>; + clock-names = "mclk"; }; diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c index 6c38cb7..d7fa8dc 100644 --- a/sound/soc/codecs/tlv320aic32x4.c +++ b/sound/soc/codecs/tlv320aic32x4.c @@ -33,6 +33,7 @@ #include <linux/i2c.h> #include <linux/cdev.h> #include <linux/slab.h> +#include <linux/clk.h> #include <sound/tlv320aic32x4.h> #include <sound/core.h> @@ -67,6 +68,7 @@ struct aic32x4_priv { u32 micpga_routing; bool swapdacs; int rstn_gpio; + struct clk *mclk; }; /* 0dB min, 0.5dB steps */ @@ -487,8 +489,21 @@ static int aic32x4_mute(struct snd_soc_dai *dai, int mute) static int aic32x4_set_bias_level(struct snd_soc_codec *codec, enum snd_soc_bias_level level) { + struct aic32x4_priv *aic32x4 = snd_soc_codec_get_drvdata(codec); + switch (level) { case SND_SOC_BIAS_ON: + /* Switch on master clock */ + if (!IS_ERR(aic32x4->mclk)) { + int ret; + + ret = clk_prepare_enable(aic32x4->mclk); + if (ret) { + dev_err(codec->dev, "Failed to enable master clock\n"); + return ret; + } + } + /* Switch on PLL */ snd_soc_update_bits(codec, AIC32X4_PLLPR, AIC32X4_PLLEN, AIC32X4_PLLEN); @@ -516,6 +531,10 @@ static int aic32x4_set_bias_level(struct snd_soc_codec *codec, case SND_SOC_BIAS_PREPARE: break; case SND_SOC_BIAS_STANDBY: + /* Switch off master clock */ + if (!IS_ERR(aic32x4->mclk)) + clk_disable_unprepare(aic32x4->mclk); + /* Switch off PLL */ snd_soc_update_bits(codec, AIC32X4_PLLPR, AIC32X4_PLLEN, 0); @@ -717,6 +736,10 @@ static int aic32x4_i2c_probe(struct i2c_client *i2c, aic32x4->rstn_gpio = -1; } + aic32x4->mclk = devm_clk_get(&i2c->dev, "mclk"); + if (IS_ERR(aic32x4->mclk)) + dev_info(&i2c->dev, "No mclk found, continuing without clock\n"); + if (gpio_is_valid(aic32x4->rstn_gpio)) { ret = devm_gpio_request_one(&i2c->dev, aic32x4->rstn_gpio, GPIOF_OUT_INIT_LOW, "tlv320aic32x4 rstn"); -- 1.8.5.2 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-01-20 12:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1390219558-25341-1-git-send-email-mpa@pengutronix.de>
2014-01-20 12:05 ` [PATCH v2 2/4] ASoC: tlv320aic32x4: DT support Markus Pargmann
2014-01-20 12:54 ` Philipp Zabel
2014-01-20 12:58 ` Markus Pargmann
[not found] ` <1390219558-25341-1-git-send-email-mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2014-01-20 12:05 ` [PATCH v2 3/4] ASoC: tlv320aic32x4: Support for master clock Markus Pargmann
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).