| Message ID | 20181013033230.6506-4-anarsoul@gmail.com |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | Add support for audiocodec in Allwinner A64 | expand |
On Sat, Oct 13, 2018 at 11:33 AM Vasily Khoruzhick <anarsoul@gmail.com> wrote: > > Some boards may have external amplifier for speaker that is controlled > via GPIO, add support for it in similar way as it's done in sun4i-codec > > Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> ASoC now has a generic amplifier driver. Please use that instead. See Documentation/devicetree/bindings/sound/simple-amplifier.txt ChenYu
On Fri, Oct 12, 2018 at 9:00 PM Chen-Yu Tsai <wens@csie.org> wrote: > > On Sat, Oct 13, 2018 at 11:33 AM Vasily Khoruzhick <anarsoul@gmail.com> wrote: > > > > Some boards may have external amplifier for speaker that is controlled > > via GPIO, add support for it in similar way as it's done in sun4i-codec > > > > Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> > > ASoC now has a generic amplifier driver. Please use that instead. > > See Documentation/devicetree/bindings/sound/simple-amplifier.txt Is there any example on how to use it? Documentation doesn't specify what DAPM routes I have to add to get it working. > > ChenYu
On Sat, Oct 13, 2018 at 12:21 PM Vasily Khoruzhick <anarsoul@gmail.com> wrote: > > On Fri, Oct 12, 2018 at 9:00 PM Chen-Yu Tsai <wens@csie.org> wrote: > > > > On Sat, Oct 13, 2018 at 11:33 AM Vasily Khoruzhick <anarsoul@gmail.com> wrote: > > > > > > Some boards may have external amplifier for speaker that is controlled > > > via GPIO, add support for it in similar way as it's done in sun4i-codec > > > > > > Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> > > > > ASoC now has a generic amplifier driver. Please use that instead. > > > > See Documentation/devicetree/bindings/sound/simple-amplifier.txt > > Is there any example on how to use it? Documentation doesn't specify > what DAPM routes I have to add to get it working. (CC-ed author, Jerome) The driver lists INL, INR, OUTL, OUTR as the in and out endpoints. Not sure why they aren't in the bindings, but this driver is relatively new. ChenYu
diff --git a/Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt b/Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt index 2ca3d138528e..21ab72b29ee4 100644 --- a/Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt +++ b/Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt @@ -25,6 +25,9 @@ Required properties: - "bus": the parent APB clock for this controller - "mod": the parent module clock +Optional properties: +- allwinner,pa-gpios: gpio to enable external amplifier + Here is an example to add a sound card and the codec binding on sun8i SoCs that are similar to A33 using simple-card: diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c index e681e194ad4c..96879dad3425 100644 --- a/sound/soc/sunxi/sun8i-codec.c +++ b/sound/soc/sunxi/sun8i-codec.c @@ -24,6 +24,7 @@ #include <linux/io.h> #include <linux/pm_runtime.h> #include <linux/regmap.h> +#include <linux/gpio/consumer.h> #include <sound/pcm_params.h> #include <sound/soc.h> @@ -97,8 +98,22 @@ struct sun8i_codec { struct regmap *regmap; struct clk *clk_module; struct clk *clk_bus; + struct gpio_desc *gpio_pa; }; +static int sun8i_codec_spk_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *k, int event) +{ + struct snd_soc_component *component = + snd_soc_dapm_to_component(w->dapm); + struct sun8i_codec *scodec = snd_soc_component_get_drvdata(component); + + gpiod_set_value_cansleep(scodec->gpio_pa, + !!SND_SOC_DAPM_EVENT_ON(event)); + + return 0; +} + static int sun8i_codec_runtime_resume(struct device *dev) { struct sun8i_codec *scodec = dev_get_drvdata(dev); @@ -432,6 +447,9 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = { SOC_MIXER_ARRAY("Right Digital ADC Mixer", SND_SOC_NOPM, 0, 0, sun8i_input_mixer_controls), + /* Speaker */ + SND_SOC_DAPM_SPK("Speaker", sun8i_codec_spk_event), + /* Clocks */ SND_SOC_DAPM_SUPPLY("MODCLK AFI1", SUN8I_MOD_CLK_ENA, SUN8I_MOD_CLK_ENA_AIF1, 0, NULL, 0), @@ -570,6 +588,15 @@ static int sun8i_codec_probe(struct platform_device *pdev) return PTR_ERR(scodec->clk_bus); } + 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; + } + res_base = platform_get_resource(pdev, IORESOURCE_MEM, 0); base = devm_ioremap_resource(&pdev->dev, res_base); if (IS_ERR(base)) {
Some boards may have external amplifier for speaker that is controlled via GPIO, add support for it in similar way as it's done in sun4i-codec Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> --- .../bindings/sound/sun8i-a33-codec.txt | 3 +++ sound/soc/sunxi/sun8i-codec.c | 27 +++++++++++++++++++ 2 files changed, 30 insertions(+)