Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b63144e6 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: arizona: Add signal activity output for DRC 



When doing signal activity detection, the only output from the DRC will
often be a GPIO pin. This patch adds a signal activity output that is
activated when a GPIO is configured to output the DRC signal activity
detection.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 326c29b6

sound/soc/codecs/arizona.c

+33 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <sound/tlv.h>



#include <linux/mfd/arizona/core.h>

#include <linux/mfd/arizona/gpio.h>

#include <linux/mfd/arizona/registers.h>



#include "arizona.h"
@@ -223,6 +224,38 @@ int arizona_init_spk(struct snd_soc_codec *codec) 
}

EXPORT_SYMBOL_GPL(arizona_init_spk);



int arizona_init_gpio(struct snd_soc_codec *codec)

{

	struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);

	struct arizona *arizona = priv->arizona;

	int i;



	switch (arizona->type) {

	case WM5110:

		snd_soc_dapm_disable_pin(&codec->dapm, "DRC2 Signal Activity");

	}



	snd_soc_dapm_disable_pin(&codec->dapm, "DRC1 Signal Activity");



	for (i = 0; i < ARRAY_SIZE(arizona->pdata.gpio_defaults); i++) {

		switch (arizona->pdata.gpio_defaults[i] & ARIZONA_GPN_FN_MASK) {

		case ARIZONA_GP_FN_DRC1_SIGNAL_DETECT:

			snd_soc_dapm_enable_pin(&codec->dapm,

						"DRC1 Signal Activity");

			break;

		case ARIZONA_GP_FN_DRC2_SIGNAL_DETECT:

			snd_soc_dapm_enable_pin(&codec->dapm,

						"DRC2 Signal Activity");

			break;

		default:

			break;

		}

	}



	return 0;

}

EXPORT_SYMBOL_GPL(arizona_init_gpio);



const char *arizona_mixer_texts[ARIZONA_NUM_MIXER_INPUTS] = {

	"None",

	"Tone Generator 1",

sound/soc/codecs/arizona.h

+1 −0
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ extern int arizona_set_fll(struct arizona_fll *fll, int source, 
			   unsigned int Fref, unsigned int Fout);



extern int arizona_init_spk(struct snd_soc_codec *codec);

extern int arizona_init_gpio(struct snd_soc_codec *codec);



extern int arizona_init_dai(struct arizona_priv *priv, int dai);

sound/soc/codecs/wm5102.c

+6 −0
Original line number Diff line number Diff line
@@ -998,6 +998,8 @@ SND_SOC_DAPM_INPUT("IN2R"), 
SND_SOC_DAPM_INPUT("IN3L"),

SND_SOC_DAPM_INPUT("IN3R"),



SND_SOC_DAPM_OUTPUT("DRC1 Signal Activity"),



SND_SOC_DAPM_PGA_E("IN1L PGA", ARIZONA_INPUT_ENABLES, ARIZONA_IN1L_ENA_SHIFT,

		   0, NULL, 0, arizona_in_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |
@@ -1614,6 +1616,9 @@ static const struct snd_soc_dapm_route wm5102_dapm_routes[] = { 
	{ "SPKDAT1R", NULL, "OUT5R" },



	{ "MICSUPP", NULL, "SYSCLK" },



	{ "DRC1 Signal Activity", NULL, "DRC1L" },

	{ "DRC1 Signal Activity", NULL, "DRC1R" },

};



static int wm5102_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
@@ -1781,6 +1786,7 @@ static int wm5102_codec_probe(struct snd_soc_codec *codec) 
		return ret;



	arizona_init_spk(codec);

	arizona_init_gpio(codec);



	snd_soc_dapm_disable_pin(&codec->dapm, "HAPTICS");

sound/soc/codecs/wm5110.c

+9 −0
Original line number Diff line number Diff line
@@ -432,6 +432,9 @@ SND_SOC_DAPM_INPUT("IN3R"), 
SND_SOC_DAPM_INPUT("IN4L"),

SND_SOC_DAPM_INPUT("IN4R"),



SND_SOC_DAPM_OUTPUT("DRC1 Signal Activity"),

SND_SOC_DAPM_OUTPUT("DRC2 Signal Activity"),



SND_SOC_DAPM_PGA_E("IN1L PGA", ARIZONA_INPUT_ENABLES, ARIZONA_IN1L_ENA_SHIFT,

		   0, NULL, 0, arizona_in_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |
@@ -1006,6 +1009,11 @@ static const struct snd_soc_dapm_route wm5110_dapm_routes[] = { 
	{ "SPKDAT2R", NULL, "OUT6R" },



	{ "MICSUPP", NULL, "SYSCLK" },



	{ "DRC1 Signal Activity", NULL, "DRC1L" },

	{ "DRC1 Signal Activity", NULL, "DRC1R" },

	{ "DRC2 Signal Activity", NULL, "DRC2L" },

	{ "DRC2 Signal Activity", NULL, "DRC2R" },

};



static int wm5110_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
@@ -1170,6 +1178,7 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec) 
		return ret;



	arizona_init_spk(codec);

	arizona_init_gpio(codec);



	snd_soc_dapm_disable_pin(&codec->dapm, "HAPTICS");