Hi,
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@xxxxxxxxxx>
> ---
> 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" },
> +};
Shouldn't it be tied to the HP outputs instead?
Thanks!
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
Attachment:
signature.asc
Description: Digital signature
