iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: ASoC: Add digital mic configuration to N810 machine driver

Browse Source 
Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jarkko Nikula 2008-06-25 14:58:47 +03:00 committed by Jaroslav Kysela
parent ee15ffdb14
commit 90b9e47671
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sound/soc/omap/n810.c
View File

@ -46,11 +46,13 @@ static struct clk *func96m_clk;
static int n810_spk_func; static int n810_spk_func;
static int n810_jack_func; static int n810_jack_func;
static int n810_dmic_func;
static void n810_ext_control(struct snd_soc_codec *codec) static void n810_ext_control(struct snd_soc_codec *codec)
{ {
snd_soc_dapm_set_endpoint(codec, "Ext Spk", n810_spk_func); snd_soc_dapm_set_endpoint(codec, "Ext Spk", n810_spk_func);
snd_soc_dapm_set_endpoint(codec, "Headphone Jack", n810_jack_func); snd_soc_dapm_set_endpoint(codec, "Headphone Jack", n810_jack_func);
snd_soc_dapm_set_endpoint(codec, "DMic", n810_dmic_func);
snd_soc_dapm_sync_endpoints(codec); snd_soc_dapm_sync_endpoints(codec);
} }
@ -150,6 +152,28 @@ static int n810_set_jack(struct snd_kcontrol *kcontrol,
return 1; return 1;
} }
static int n810_get_input(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
ucontrol->value.integer.value[0] = n810_dmic_func;
return 0;
}
static int n810_set_input(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
if (n810_dmic_func == ucontrol->value.integer.value[0])
return 0;
n810_dmic_func = ucontrol->value.integer.value[0];
n810_ext_control(codec);
return 1;
}
static int n810_spk_event(struct snd_soc_dapm_widget *w, static int n810_spk_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *k, int event) struct snd_kcontrol *k, int event)
{ {
@ -175,6 +199,7 @@ static int n810_jack_event(struct snd_soc_dapm_widget *w,
static const struct snd_soc_dapm_widget aic33_dapm_widgets[] = { static const struct snd_soc_dapm_widget aic33_dapm_widgets[] = {
SND_SOC_DAPM_SPK("Ext Spk", n810_spk_event), SND_SOC_DAPM_SPK("Ext Spk", n810_spk_event),
SND_SOC_DAPM_HP("Headphone Jack", n810_jack_event), SND_SOC_DAPM_HP("Headphone Jack", n810_jack_event),
SND_SOC_DAPM_MIC("DMic", NULL),
}; };
static const struct snd_soc_dapm_route audio_map[] = { static const struct snd_soc_dapm_route audio_map[] = {
@ -183,13 +208,18 @@ static const struct snd_soc_dapm_route audio_map[] = {
{"Ext Spk", NULL, "LLOUT"}, {"Ext Spk", NULL, "LLOUT"},
{"Ext Spk", NULL, "RLOUT"}, {"Ext Spk", NULL, "RLOUT"},
{"DMic Rate 64", NULL, "Mic Bias 2V"},
{"Mic Bias 2V", NULL, "DMic"},
}; };
static const char *spk_function[] = {"Off", "On"}; static const char *spk_function[] = {"Off", "On"};
static const char *jack_function[] = {"Off", "Headphone"}; static const char *jack_function[] = {"Off", "Headphone"};
static const char *input_function[] = {"ADC", "Digital Mic"};
static const struct soc_enum n810_enum[] = { static const struct soc_enum n810_enum[] = {
SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(spk_function), spk_function), SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(spk_function), spk_function),
SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(jack_function), jack_function), SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(jack_function), jack_function),
SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(input_function), input_function),
}; };
static const struct snd_kcontrol_new aic33_n810_controls[] = { static const struct snd_kcontrol_new aic33_n810_controls[] = {
@ -197,6 +227,8 @@ static const struct snd_kcontrol_new aic33_n810_controls[] = {
n810_get_spk, n810_set_spk), n810_get_spk, n810_set_spk),
SOC_ENUM_EXT("Jack Function", n810_enum[1], SOC_ENUM_EXT("Jack Function", n810_enum[1],
n810_get_jack, n810_set_jack), n810_get_jack, n810_set_jack),
SOC_ENUM_EXT("Input Select", n810_enum[2],
n810_get_input, n810_set_input),
}; };
static int n810_aic33_init(struct snd_soc_codec *codec) static int n810_aic33_init(struct snd_soc_codec *codec)
@ -248,6 +280,8 @@ static struct snd_soc_machine snd_soc_machine_n810 = {
/* Audio private data */ /* Audio private data */
static struct aic3x_setup_data n810_aic33_setup = { static struct aic3x_setup_data n810_aic33_setup = {
.i2c_address = 0x18, .i2c_address = 0x18,
.gpio_func[0] = AIC3X_GPIO1_FUNC_DISABLED,
.gpio_func[1] = AIC3X_GPIO2_FUNC_DIGITAL_MIC_INPUT,
}; };
/* Audio subsystem */ /* Audio subsystem */