From: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> To: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> Cc: Liam Girdwood <lgirdwood-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, Jaroslav Kysela <perex-/Fr2/VpizcU@public.gmane.org>, Takashi Iwai <tiwai-IBi9RG/b67k@public.gmane.org>, Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>, Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>, alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, devicetree <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>, linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org Subject: Re: [PATCH v2 2/4] ASoC: sun4i-codec: Add support for PA gpio pin Date: Sun, 13 Dec 2015 19:11:28 -0600 [thread overview] Message-ID: <20151214011128.GA4011@rob-hp-laptop> (raw) In-Reply-To: <1449859439-30875-2-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> On Fri, Dec 11, 2015 at 07:43:57PM +0100, Hans de Goede wrote: > Add support for PA gpio pin for controlling an external amplifier as used > on some Allwinner boards. > > Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> > --- > Changes in v2: > -Use a dapm speaker widget (SND_SOC_DAPM_SPK) to control the gpio > -Rename gpio in devicetree from pa-gpios to allwinner,pa-gpios > --- > .../devicetree/bindings/sound/sun4i-codec.txt | 3 ++ > sound/soc/sunxi/sun4i-codec.c | 35 ++++++++++++++++++++++ > 2 files changed, 38 insertions(+) > > diff --git a/Documentation/devicetree/bindings/sound/sun4i-codec.txt b/Documentation/devicetree/bindings/sound/sun4i-codec.txt > index c92966b..0dce690 100644 > --- a/Documentation/devicetree/bindings/sound/sun4i-codec.txt > +++ b/Documentation/devicetree/bindings/sound/sun4i-codec.txt > @@ -14,6 +14,9 @@ Required properties: > - "apb": the parent APB clock for this controller > - "codec": the parent module clock > > +Optional properties: > +- allwinner,pa-gpios: gpio to enable external amplifier > + > Example: > codec: codec@01c22c00 { > #sound-dai-cells = <0>; > diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c > index 519ccb3..e6cc6a1 100644 > --- a/sound/soc/sunxi/sun4i-codec.c > +++ b/sound/soc/sunxi/sun4i-codec.c > @@ -28,6 +28,7 @@ > #include <linux/of_address.h> > #include <linux/clk.h> > #include <linux/regmap.h> > +#include <linux/gpio/consumer.h> > > #include <sound/core.h> > #include <sound/pcm.h> > @@ -103,6 +104,7 @@ struct sun4i_codec { > struct regmap *regmap; > struct clk *clk_apb; > struct clk *clk_module; > + struct gpio_desc *gpio_pa; > > struct snd_dmaengine_dai_dma_data capture_dma_data; > struct snd_dmaengine_dai_dma_data playback_dma_data; > @@ -709,6 +711,26 @@ static struct snd_soc_dai_link *sun4i_codec_create_link(struct device *dev, > return link; > }; > > +static int sun4i_codec_spk_event(struct snd_soc_dapm_widget *w, > + struct snd_kcontrol *k, int event) > +{ > + struct sun4i_codec *scodec = snd_soc_card_get_drvdata(w->dapm->card); > + > + if (scodec->gpio_pa) > + gpiod_set_value_cansleep(scodec->gpio_pa, > + !!SND_SOC_DAPM_EVENT_ON(event)); > + > + return 0; > +} > + > +static const struct snd_soc_dapm_widget sun4i_codec_card_dapm_widgets[] = { > + SND_SOC_DAPM_SPK("Speaker", sun4i_codec_spk_event), > +}; > + > +static const struct snd_soc_dapm_route sun4i_codec_card_dapm_routes[] = { > + { "Speaker", NULL, "Power Amplifier" }, > +}; > + > static struct snd_soc_card *sun4i_codec_create_card(struct device *dev) > { > struct snd_soc_card *card; > @@ -723,6 +745,10 @@ static struct snd_soc_card *sun4i_codec_create_card(struct device *dev) > > card->dev = dev; > card->name = "sun4i-codec"; > + card->dapm_widgets = sun4i_codec_card_dapm_widgets; > + card->num_dapm_widgets = ARRAY_SIZE(sun4i_codec_card_dapm_widgets); > + card->dapm_routes = sun4i_codec_card_dapm_routes; > + card->num_dapm_routes = ARRAY_SIZE(sun4i_codec_card_dapm_routes); > > return card; > }; > @@ -774,6 +800,15 @@ static int sun4i_codec_probe(struct platform_device *pdev) > return -EINVAL; > } > > + scodec->gpio_pa = devm_gpiod_get_optional(&pdev->dev, "allwinner,pa", > + GPIOD_OUT_LOW); > + if (IS_ERR(scodec->gpio_pa)) { > + ret = PTR_ERR(scodec->gpio_pa); > + if (ret != -EPROBE_DEFER) > + dev_err(&pdev->dev, "Failed to get pa gpio: %d\n", ret); > + return ret; > + } > + > /* DMA configuration for TX FIFO */ > scodec->playback_dma_data.addr = res->start + SUN4I_CODEC_DAC_TXDATA; > scodec->playback_dma_data.maxburst = 4; > -- > 2.5.0 > > -- > 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
WARNING: multiple messages have this Message-ID (diff)
From: robh@kernel.org (Rob Herring) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 2/4] ASoC: sun4i-codec: Add support for PA gpio pin Date: Sun, 13 Dec 2015 19:11:28 -0600 [thread overview] Message-ID: <20151214011128.GA4011@rob-hp-laptop> (raw) In-Reply-To: <1449859439-30875-2-git-send-email-hdegoede@redhat.com> On Fri, Dec 11, 2015 at 07:43:57PM +0100, Hans de Goede wrote: > Add support for PA gpio pin for controlling an external amplifier as used > on some Allwinner boards. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Rob Herring <robh@kernel.org> > --- > Changes in v2: > -Use a dapm speaker widget (SND_SOC_DAPM_SPK) to control the gpio > -Rename gpio in devicetree from pa-gpios to allwinner,pa-gpios > --- > .../devicetree/bindings/sound/sun4i-codec.txt | 3 ++ > sound/soc/sunxi/sun4i-codec.c | 35 ++++++++++++++++++++++ > 2 files changed, 38 insertions(+) > > diff --git a/Documentation/devicetree/bindings/sound/sun4i-codec.txt b/Documentation/devicetree/bindings/sound/sun4i-codec.txt > index c92966b..0dce690 100644 > --- a/Documentation/devicetree/bindings/sound/sun4i-codec.txt > +++ b/Documentation/devicetree/bindings/sound/sun4i-codec.txt > @@ -14,6 +14,9 @@ Required properties: > - "apb": the parent APB clock for this controller > - "codec": the parent module clock > > +Optional properties: > +- allwinner,pa-gpios: gpio to enable external amplifier > + > Example: > codec: codec at 01c22c00 { > #sound-dai-cells = <0>; > diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c > index 519ccb3..e6cc6a1 100644 > --- a/sound/soc/sunxi/sun4i-codec.c > +++ b/sound/soc/sunxi/sun4i-codec.c > @@ -28,6 +28,7 @@ > #include <linux/of_address.h> > #include <linux/clk.h> > #include <linux/regmap.h> > +#include <linux/gpio/consumer.h> > > #include <sound/core.h> > #include <sound/pcm.h> > @@ -103,6 +104,7 @@ struct sun4i_codec { > struct regmap *regmap; > struct clk *clk_apb; > struct clk *clk_module; > + struct gpio_desc *gpio_pa; > > struct snd_dmaengine_dai_dma_data capture_dma_data; > struct snd_dmaengine_dai_dma_data playback_dma_data; > @@ -709,6 +711,26 @@ static struct snd_soc_dai_link *sun4i_codec_create_link(struct device *dev, > return link; > }; > > +static int sun4i_codec_spk_event(struct snd_soc_dapm_widget *w, > + struct snd_kcontrol *k, int event) > +{ > + struct sun4i_codec *scodec = snd_soc_card_get_drvdata(w->dapm->card); > + > + if (scodec->gpio_pa) > + gpiod_set_value_cansleep(scodec->gpio_pa, > + !!SND_SOC_DAPM_EVENT_ON(event)); > + > + return 0; > +} > + > +static const struct snd_soc_dapm_widget sun4i_codec_card_dapm_widgets[] = { > + SND_SOC_DAPM_SPK("Speaker", sun4i_codec_spk_event), > +}; > + > +static const struct snd_soc_dapm_route sun4i_codec_card_dapm_routes[] = { > + { "Speaker", NULL, "Power Amplifier" }, > +}; > + > static struct snd_soc_card *sun4i_codec_create_card(struct device *dev) > { > struct snd_soc_card *card; > @@ -723,6 +745,10 @@ static struct snd_soc_card *sun4i_codec_create_card(struct device *dev) > > card->dev = dev; > card->name = "sun4i-codec"; > + card->dapm_widgets = sun4i_codec_card_dapm_widgets; > + card->num_dapm_widgets = ARRAY_SIZE(sun4i_codec_card_dapm_widgets); > + card->dapm_routes = sun4i_codec_card_dapm_routes; > + card->num_dapm_routes = ARRAY_SIZE(sun4i_codec_card_dapm_routes); > > return card; > }; > @@ -774,6 +800,15 @@ static int sun4i_codec_probe(struct platform_device *pdev) > return -EINVAL; > } > > + scodec->gpio_pa = devm_gpiod_get_optional(&pdev->dev, "allwinner,pa", > + GPIOD_OUT_LOW); > + if (IS_ERR(scodec->gpio_pa)) { > + ret = PTR_ERR(scodec->gpio_pa); > + if (ret != -EPROBE_DEFER) > + dev_err(&pdev->dev, "Failed to get pa gpio: %d\n", ret); > + return ret; > + } > + > /* DMA configuration for TX FIFO */ > scodec->playback_dma_data.addr = res->start + SUN4I_CODEC_DAC_TXDATA; > scodec->playback_dma_data.maxburst = 4; > -- > 2.5.0 > > -- > To unsubscribe from this list: send the line "unsubscribe devicetree" in > the body of a message to majordomo at vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2015-12-14 1:11 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-12-11 18:43 [PATCH v2 1/4] ASoC: sun4i-codec: Rename codec dapm widgets and routes Hans de Goede 2015-12-11 18:43 ` Hans de Goede 2015-12-12 23:07 ` Applied "ASoC: sun4i-codec: Rename codec dapm widgets and routes" to the asoc tree Mark Brown [not found] ` <1449859439-30875-1-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2015-12-11 18:43 ` [PATCH v2 2/4] ASoC: sun4i-codec: Add support for PA gpio pin Hans de Goede 2015-12-11 18:43 ` Hans de Goede 2015-12-12 23:01 ` Mark Brown 2015-12-12 23:01 ` Mark Brown 2015-12-12 23:07 ` Applied "ASoC: sun4i-codec: Add support for PA gpio pin" to the asoc tree Mark Brown [not found] ` <1449859439-30875-2-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2015-12-14 1:11 ` Rob Herring [this message] 2015-12-14 1:11 ` [PATCH v2 2/4] ASoC: sun4i-codec: Add support for PA gpio pin Rob Herring 2015-12-14 15:56 ` Maxime Ripard 2015-12-14 15:56 ` Maxime Ripard 2015-12-14 16:07 ` [linux-sunxi] " Hans de Goede 2015-12-14 16:07 ` Hans de Goede [not found] ` <566EE953.3050702-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2015-12-18 20:53 ` Maxime Ripard 2015-12-18 20:53 ` [linux-sunxi] " Maxime Ripard 2015-12-11 18:43 ` [PATCH v2 3/4] ARM: dts: sun5i: Enable onboard codec used on the UTOO P66 tablet Hans de Goede 2015-12-11 18:43 ` Hans de Goede 2015-12-11 18:43 ` [PATCH v2 4/4] ARM: dts: sun4i: Enable onboard codec used on the pov protab2-ips9 tablet Hans de Goede 2015-12-11 18:43 ` Hans de Goede [not found] ` <1449859439-30875-4-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2015-12-18 21:19 ` Maxime Ripard 2015-12-18 21:19 ` Maxime Ripard 2015-12-14 9:44 ` [PATCH v2 1/4] ASoC: sun4i-codec: Rename codec dapm widgets and routes Maxime Ripard 2015-12-14 9:44 ` Maxime Ripard
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20151214011128.GA4011@rob-hp-laptop \ --to=robh-dgejt+ai2ygdnm+yrofe0a@public.gmane.org \ --cc=alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org \ --cc=broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \ --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \ --cc=lgirdwood-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org \ --cc=maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \ --cc=perex-/Fr2/VpizcU@public.gmane.org \ --cc=tiwai-IBi9RG/b67k@public.gmane.org \ --cc=wens-jdAy2FN1RRM@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.