ASoC: sn95031: add capture support
This patch adds the support for capture path in sn95031 codec. This codec supports upto 6DMICs, 2 AMICs and Linein. The linein and AMICs are connected through a MUX to ADC. The TX paths can be assigned to any of the ADCs or DMICs. Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Harsha Priya <priya.harsha@intel.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Harsha Priya
Mark Brown
parent
1166f985d3
commit
fd94eeef06
|
|
@ -33,6 +33,7 @@
|
|||
#include <sound/soc.h>
|
||||
#include <sound/soc-dapm.h>
|
||||
#include <sound/initval.h>
|
||||
#include <sound/tlv.h>
|
||||
#include "sn95031.h"
|
||||
|
||||
#define SN95031_RATES (SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_44100)
|
||||
|
|
@ -145,6 +146,129 @@ static int sn95031_vihf_event(struct snd_soc_dapm_widget *w,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int sn95031_dmic12_event(struct snd_soc_dapm_widget *w,
|
||||
struct snd_kcontrol *k, int event)
|
||||
{
|
||||
unsigned int ldo = 0, clk_dir = 0, data_dir = 0;
|
||||
|
||||
if (SND_SOC_DAPM_EVENT_ON(event)) {
|
||||
ldo = BIT(5)|BIT(4);
|
||||
clk_dir = BIT(0);
|
||||
data_dir = BIT(7);
|
||||
}
|
||||
/* program DMIC LDO, clock and set clock */
|
||||
snd_soc_update_bits(w->codec, SN95031_MICBIAS, BIT(5)|BIT(4), ldo);
|
||||
snd_soc_update_bits(w->codec, SN95031_DMICBUF0123, BIT(0), clk_dir);
|
||||
snd_soc_update_bits(w->codec, SN95031_DMICBUF0123, BIT(7), data_dir);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sn95031_dmic34_event(struct snd_soc_dapm_widget *w,
|
||||
struct snd_kcontrol *k, int event)
|
||||
{
|
||||
unsigned int ldo = 0, clk_dir = 0, data_dir = 0;
|
||||
|
||||
if (SND_SOC_DAPM_EVENT_ON(event)) {
|
||||
ldo = BIT(5)|BIT(4);
|
||||
clk_dir = BIT(2);
|
||||
data_dir = BIT(1);
|
||||
}
|
||||
/* program DMIC LDO, clock and set clock */
|
||||
snd_soc_update_bits(w->codec, SN95031_MICBIAS, BIT(5)|BIT(4), ldo);
|
||||
snd_soc_update_bits(w->codec, SN95031_DMICBUF0123, BIT(2), clk_dir);
|
||||
snd_soc_update_bits(w->codec, SN95031_DMICBUF45, BIT(1), data_dir);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sn95031_dmic56_event(struct snd_soc_dapm_widget *w,
|
||||
struct snd_kcontrol *k, int event)
|
||||
{
|
||||
unsigned int ldo = 0;
|
||||
|
||||
if (SND_SOC_DAPM_EVENT_ON(event))
|
||||
ldo = BIT(7)|BIT(6);
|
||||
|
||||
/* program DMIC LDO */
|
||||
snd_soc_update_bits(w->codec, SN95031_MICBIAS, BIT(7)|BIT(6), ldo);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* mux controls */
|
||||
static const char *sn95031_mic_texts[] = { "AMIC", "LineIn" };
|
||||
|
||||
static const struct soc_enum sn95031_micl_enum =
|
||||
SOC_ENUM_SINGLE(SN95031_ADCCONFIG, 1, 2, sn95031_mic_texts);
|
||||
|
||||
static const struct snd_kcontrol_new sn95031_micl_mux_control =
|
||||
SOC_DAPM_ENUM("Route", sn95031_micl_enum);
|
||||
|
||||
static const struct soc_enum sn95031_micr_enum =
|
||||
SOC_ENUM_SINGLE(SN95031_ADCCONFIG, 3, 2, sn95031_mic_texts);
|
||||
|
||||
static const struct snd_kcontrol_new sn95031_micr_mux_control =
|
||||
SOC_DAPM_ENUM("Route", sn95031_micr_enum);
|
||||
|
||||
static const char *sn95031_input_texts[] = { "DMIC1", "DMIC2", "DMIC3",
|
||||
"DMIC4", "DMIC5", "DMIC6",
|
||||
"ADC Left", "ADC Right" };
|
||||
|
||||
static const struct soc_enum sn95031_input1_enum =
|
||||
SOC_ENUM_SINGLE(SN95031_AUDIOMUX12, 0, 8, sn95031_input_texts);
|
||||
|
||||
static const struct snd_kcontrol_new sn95031_input1_mux_control =
|
||||
SOC_DAPM_ENUM("Route", sn95031_input1_enum);
|
||||
|
||||
static const struct soc_enum sn95031_input2_enum =
|
||||
SOC_ENUM_SINGLE(SN95031_AUDIOMUX12, 4, 8, sn95031_input_texts);
|
||||
|
||||
static const struct snd_kcontrol_new sn95031_input2_mux_control =
|
||||
SOC_DAPM_ENUM("Route", sn95031_input2_enum);
|
||||
|
||||
static const struct soc_enum sn95031_input3_enum =
|
||||
SOC_ENUM_SINGLE(SN95031_AUDIOMUX34, 0, 8, sn95031_input_texts);
|
||||
|
||||
static const struct snd_kcontrol_new sn95031_input3_mux_control =
|
||||
SOC_DAPM_ENUM("Route", sn95031_input3_enum);
|
||||
|
||||
static const struct soc_enum sn95031_input4_enum =
|
||||
SOC_ENUM_SINGLE(SN95031_AUDIOMUX34, 4, 8, sn95031_input_texts);
|
||||
|
||||
static const struct snd_kcontrol_new sn95031_input4_mux_control =
|
||||
SOC_DAPM_ENUM("Route", sn95031_input4_enum);
|
||||
|
||||
/* capture path controls */
|
||||
|
||||
static const char *sn95031_micmode_text[] = {"Single Ended", "Differential"};
|
||||
|
||||
/* 0dB to 30dB in 10dB steps */
|
||||
static const DECLARE_TLV_DB_SCALE(mic_tlv, 0, 10, 30);
|
||||
|
||||
static const struct soc_enum sn95031_micmode1_enum =
|
||||
SOC_ENUM_SINGLE(SN95031_MICAMP1, 1, 2, sn95031_micmode_text);
|
||||
static const struct soc_enum sn95031_micmode2_enum =
|
||||
SOC_ENUM_SINGLE(SN95031_MICAMP2, 1, 2, sn95031_micmode_text);
|
||||
|
||||
static const char *sn95031_dmic_cfg_text[] = {"GPO", "DMIC"};
|
||||
|
||||
static const struct soc_enum sn95031_dmic12_cfg_enum =
|
||||
SOC_ENUM_SINGLE(SN95031_DMICMUX, 0, 2, sn95031_dmic_cfg_text);
|
||||
static const struct soc_enum sn95031_dmic34_cfg_enum =
|
||||
SOC_ENUM_SINGLE(SN95031_DMICMUX, 1, 2, sn95031_dmic_cfg_text);
|
||||
static const struct soc_enum sn95031_dmic56_cfg_enum =
|
||||
SOC_ENUM_SINGLE(SN95031_DMICMUX, 2, 2, sn95031_dmic_cfg_text);
|
||||
|
||||
static const struct snd_kcontrol_new sn95031_snd_controls[] = {
|
||||
SOC_ENUM("Mic1Mode Capture Route", sn95031_micmode1_enum),
|
||||
SOC_ENUM("Mic2Mode Capture Route", sn95031_micmode2_enum),
|
||||
SOC_ENUM("DMIC12 Capture Route", sn95031_dmic12_cfg_enum),
|
||||
SOC_ENUM("DMIC34 Capture Route", sn95031_dmic34_cfg_enum),
|
||||
SOC_ENUM("DMIC56 Capture Route", sn95031_dmic56_cfg_enum),
|
||||
SOC_SINGLE_TLV("Mic1 Capture Volume", SN95031_MICAMP1,
|
||||
2, 4, 0, mic_tlv),
|
||||
SOC_SINGLE_TLV("Mic2 Capture Volume", SN95031_MICAMP2,
|
||||
2, 4, 0, mic_tlv),
|
||||
};
|
||||
|
||||
/* DAPM widgets */
|
||||
static const struct snd_soc_dapm_widget sn95031_dapm_widgets[] = {
|
||||
|
||||
|
|
@ -159,6 +283,36 @@ static const struct snd_soc_dapm_widget sn95031_dapm_widgets[] = {
|
|||
SND_SOC_DAPM_OUTPUT("VIB1OUT"),
|
||||
SND_SOC_DAPM_OUTPUT("VIB2OUT"),
|
||||
|
||||
SND_SOC_DAPM_INPUT("AMIC1"), /* headset mic */
|
||||
SND_SOC_DAPM_INPUT("AMIC2"),
|
||||
SND_SOC_DAPM_INPUT("DMIC1"),
|
||||
SND_SOC_DAPM_INPUT("DMIC2"),
|
||||
SND_SOC_DAPM_INPUT("DMIC3"),
|
||||
SND_SOC_DAPM_INPUT("DMIC4"),
|
||||
SND_SOC_DAPM_INPUT("DMIC5"),
|
||||
SND_SOC_DAPM_INPUT("DMIC6"),
|
||||
SND_SOC_DAPM_INPUT("LINEINL"),
|
||||
SND_SOC_DAPM_INPUT("LINEINR"),
|
||||
|
||||
SND_SOC_DAPM_MICBIAS("AMIC1Bias", SN95031_MICBIAS, 2, 0),
|
||||
SND_SOC_DAPM_MICBIAS("AMIC2Bias", SN95031_MICBIAS, 3, 0),
|
||||
SND_SOC_DAPM_MICBIAS("DMIC12Bias", SN95031_DMICMUX, 3, 0),
|
||||
SND_SOC_DAPM_MICBIAS("DMIC34Bias", SN95031_DMICMUX, 4, 0),
|
||||
SND_SOC_DAPM_MICBIAS("DMIC56Bias", SN95031_DMICMUX, 5, 0),
|
||||
|
||||
SND_SOC_DAPM_SUPPLY("DMIC12supply", SN95031_DMICLK, 0, 0,
|
||||
sn95031_dmic12_event,
|
||||
SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
|
||||
SND_SOC_DAPM_SUPPLY("DMIC34supply", SN95031_DMICLK, 1, 0,
|
||||
sn95031_dmic34_event,
|
||||
SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
|
||||
SND_SOC_DAPM_SUPPLY("DMIC56supply", SN95031_DMICLK, 2, 0,
|
||||
sn95031_dmic56_event,
|
||||
SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
|
||||
|
||||
SND_SOC_DAPM_AIF_OUT("PCM_Out", "Capture", 0,
|
||||
SND_SOC_NOPM, 0, 0),
|
||||
|
||||
SND_SOC_DAPM_SUPPLY("Headset Rail", SND_SOC_NOPM, 0, 0,
|
||||
sn95031_vhs_event,
|
||||
SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
|
||||
|
|
@ -209,6 +363,40 @@ static const struct snd_soc_dapm_widget sn95031_dapm_widgets[] = {
|
|||
SN95031_VIB1C5, 1, 0),
|
||||
SND_SOC_DAPM_DAC("Vibra2 DAC", "Vibra2",
|
||||
SN95031_VIB2C5, 1, 0),
|
||||
|
||||
/* capture widgets */
|
||||
SND_SOC_DAPM_PGA("LineIn Enable Left", SN95031_MICAMP1,
|
||||
7, 0, NULL, 0),
|
||||
SND_SOC_DAPM_PGA("LineIn Enable Right", SN95031_MICAMP2,
|
||||
7, 0, NULL, 0),
|
||||
|
||||
SND_SOC_DAPM_PGA("MIC1 Enable", SN95031_MICAMP1, 0, 0, NULL, 0),
|
||||
SND_SOC_DAPM_PGA("MIC2 Enable", SN95031_MICAMP2, 0, 0, NULL, 0),
|
||||
SND_SOC_DAPM_PGA("TX1 Enable", SN95031_AUDIOTXEN, 2, 0, NULL, 0),
|
||||
SND_SOC_DAPM_PGA("TX2 Enable", SN95031_AUDIOTXEN, 3, 0, NULL, 0),
|
||||
SND_SOC_DAPM_PGA("TX3 Enable", SN95031_AUDIOTXEN, 4, 0, NULL, 0),
|
||||
SND_SOC_DAPM_PGA("TX4 Enable", SN95031_AUDIOTXEN, 5, 0, NULL, 0),
|
||||
|
||||
/* ADC have null stream as they will be turned ON by TX path */
|
||||
SND_SOC_DAPM_ADC("ADC Left", NULL,
|
||||
SN95031_ADCCONFIG, 0, 0),
|
||||
SND_SOC_DAPM_ADC("ADC Right", NULL,
|
||||
SN95031_ADCCONFIG, 2, 0),
|
||||
|
||||
SND_SOC_DAPM_MUX("Mic_InputL Capture Route",
|
||||
SND_SOC_NOPM, 0, 0, &sn95031_micl_mux_control),
|
||||
SND_SOC_DAPM_MUX("Mic_InputR Capture Route",
|
||||
SND_SOC_NOPM, 0, 0, &sn95031_micr_mux_control),
|
||||
|
||||
SND_SOC_DAPM_MUX("Txpath1 Capture Route",
|
||||
SND_SOC_NOPM, 0, 0, &sn95031_input1_mux_control),
|
||||
SND_SOC_DAPM_MUX("Txpath2 Capture Route",
|
||||
SND_SOC_NOPM, 0, 0, &sn95031_input2_mux_control),
|
||||
SND_SOC_DAPM_MUX("Txpath3 Capture Route",
|
||||
SND_SOC_NOPM, 0, 0, &sn95031_input3_mux_control),
|
||||
SND_SOC_DAPM_MUX("Txpath4 Capture Route",
|
||||
SND_SOC_NOPM, 0, 0, &sn95031_input4_mux_control),
|
||||
|
||||
};
|
||||
|
||||
static const struct snd_soc_dapm_route sn95031_audio_map[] = {
|
||||
|
|
@ -250,6 +438,87 @@ static const struct snd_soc_dapm_route sn95031_audio_map[] = {
|
|||
{ "Lineout Right Playback", NULL, "Headset Right Filter"},
|
||||
{ "Lineout Right Playback", NULL, "Speaker Right Filter"},
|
||||
{ "Lineout Right Playback", NULL, "Vibra2 DAC"},
|
||||
|
||||
/* Headset (AMIC1) mic */
|
||||
{ "AMIC1Bias", NULL, "AMIC1"},
|
||||
{ "MIC1 Enable", NULL, "AMIC1Bias"},
|
||||
{ "Mic_InputL Capture Route", "AMIC", "MIC1 Enable"},
|
||||
|
||||
/* AMIC2 */
|
||||
{ "AMIC2Bias", NULL, "AMIC2"},
|
||||
{ "MIC2 Enable", NULL, "AMIC2Bias"},
|
||||
{ "Mic_InputR Capture Route", "AMIC", "MIC2 Enable"},
|
||||
|
||||
|
||||
/* Linein */
|
||||
{ "LineIn Enable Left", NULL, "LINEINL"},
|
||||
{ "LineIn Enable Right", NULL, "LINEINR"},
|
||||
{ "Mic_InputL Capture Route", "LineIn", "LineIn Enable Left"},
|
||||
{ "Mic_InputR Capture Route", "LineIn", "LineIn Enable Right"},
|
||||
|
||||
/* ADC connection */
|
||||
{ "ADC Left", NULL, "Mic_InputL Capture Route"},
|
||||
{ "ADC Right", NULL, "Mic_InputR Capture Route"},
|
||||
|
||||
/*DMIC connections */
|
||||
{ "DMIC1", NULL, "DMIC12supply"},
|
||||
{ "DMIC2", NULL, "DMIC12supply"},
|
||||
{ "DMIC3", NULL, "DMIC34supply"},
|
||||
{ "DMIC4", NULL, "DMIC34supply"},
|
||||
{ "DMIC5", NULL, "DMIC56supply"},
|
||||
{ "DMIC6", NULL, "DMIC56supply"},
|
||||
|
||||
{ "DMIC12Bias", NULL, "DMIC1"},
|
||||
{ "DMIC12Bias", NULL, "DMIC2"},
|
||||
{ "DMIC34Bias", NULL, "DMIC3"},
|
||||
{ "DMIC34Bias", NULL, "DMIC4"},
|
||||
{ "DMIC56Bias", NULL, "DMIC5"},
|
||||
{ "DMIC56Bias", NULL, "DMIC6"},
|
||||
|
||||
/*TX path inputs*/
|
||||
{ "Txpath1 Capture Route", "ADC Left", "ADC Left"},
|
||||
{ "Txpath2 Capture Route", "ADC Left", "ADC Left"},
|
||||
{ "Txpath3 Capture Route", "ADC Left", "ADC Left"},
|
||||
{ "Txpath4 Capture Route", "ADC Left", "ADC Left"},
|
||||
{ "Txpath1 Capture Route", "ADC Right", "ADC Right"},
|
||||
{ "Txpath2 Capture Route", "ADC Right", "ADC Right"},
|
||||
{ "Txpath3 Capture Route", "ADC Right", "ADC Right"},
|
||||
{ "Txpath4 Capture Route", "ADC Right", "ADC Right"},
|
||||
{ "Txpath1 Capture Route", NULL, "DMIC1"},
|
||||
{ "Txpath2 Capture Route", NULL, "DMIC1"},
|
||||
{ "Txpath3 Capture Route", NULL, "DMIC1"},
|
||||
{ "Txpath4 Capture Route", NULL, "DMIC1"},
|
||||
{ "Txpath1 Capture Route", NULL, "DMIC2"},
|
||||
{ "Txpath2 Capture Route", NULL, "DMIC2"},
|
||||
{ "Txpath3 Capture Route", NULL, "DMIC2"},
|
||||
{ "Txpath4 Capture Route", NULL, "DMIC2"},
|
||||
{ "Txpath1 Capture Route", NULL, "DMIC3"},
|
||||
{ "Txpath2 Capture Route", NULL, "DMIC3"},
|
||||
{ "Txpath3 Capture Route", NULL, "DMIC3"},
|
||||
{ "Txpath4 Capture Route", NULL, "DMIC3"},
|
||||
{ "Txpath1 Capture Route", NULL, "DMIC4"},
|
||||
{ "Txpath2 Capture Route", NULL, "DMIC4"},
|
||||
{ "Txpath3 Capture Route", NULL, "DMIC4"},
|
||||
{ "Txpath4 Capture Route", NULL, "DMIC4"},
|
||||
{ "Txpath1 Capture Route", NULL, "DMIC5"},
|
||||
{ "Txpath2 Capture Route", NULL, "DMIC5"},
|
||||
{ "Txpath3 Capture Route", NULL, "DMIC5"},
|
||||
{ "Txpath4 Capture Route", NULL, "DMIC5"},
|
||||
{ "Txpath1 Capture Route", NULL, "DMIC6"},
|
||||
{ "Txpath2 Capture Route", NULL, "DMIC6"},
|
||||
{ "Txpath3 Capture Route", NULL, "DMIC6"},
|
||||
{ "Txpath4 Capture Route", NULL, "DMIC6"},
|
||||
|
||||
/* tx path */
|
||||
{ "TX1 Enable", NULL, "Txpath1 Capture Route"},
|
||||
{ "TX2 Enable", NULL, "Txpath2 Capture Route"},
|
||||
{ "TX3 Enable", NULL, "Txpath3 Capture Route"},
|
||||
{ "TX4 Enable", NULL, "Txpath4 Capture Route"},
|
||||
{ "PCM_Out", NULL, "TX1 Enable"},
|
||||
{ "PCM_Out", NULL, "TX2 Enable"},
|
||||
{ "PCM_Out", NULL, "TX3 Enable"},
|
||||
{ "PCM_Out", NULL, "TX4 Enable"},
|
||||
|
||||
};
|
||||
|
||||
/* speaker and headset mutes, for audio pops and clicks */
|
||||
|
|
@ -339,6 +608,13 @@ struct snd_soc_dai_driver sn95031_dais[] = {
|
|||
.rates = SN95031_RATES,
|
||||
.formats = SN95031_FORMATS,
|
||||
},
|
||||
.capture = {
|
||||
.stream_name = "Capture",
|
||||
.channels_min = 1,
|
||||
.channels_max = 5,
|
||||
.rates = SN95031_RATES,
|
||||
.formats = SN95031_FORMATS,
|
||||
},
|
||||
.ops = &sn95031_headset_dai_ops,
|
||||
},
|
||||
{ .name = "SN95031 Speaker",
|
||||
|
|
@ -390,6 +666,8 @@ static int sn95031_codec_probe(struct snd_soc_codec *codec)
|
|||
snd_soc_write(codec, SN95031_PCM2RXSLOT01, 0x10);
|
||||
snd_soc_write(codec, SN95031_PCM2RXSLOT23, 0x32);
|
||||
snd_soc_write(codec, SN95031_PCM2RXSLOT45, 0x54);
|
||||
snd_soc_write(codec, SN95031_PCM2TXSLOT01, 0x10);
|
||||
snd_soc_write(codec, SN95031_PCM2TXSLOT23, 0x32);
|
||||
/* pcm port setting
|
||||
* This sets the pcm port to slave and clock at 19.2Mhz which
|
||||
* can support 6slots, sampling rate set per stream in hw-params
|
||||
|
|
@ -423,6 +701,9 @@ static int sn95031_codec_probe(struct snd_soc_codec *codec)
|
|||
snd_soc_write(codec, SN95031_SSR2, 0x10);
|
||||
snd_soc_write(codec, SN95031_SSR3, 0x40);
|
||||
|
||||
snd_soc_add_controls(codec, sn95031_snd_controls,
|
||||
ARRAY_SIZE(sn95031_snd_controls));
|
||||
|
||||
ret = snd_soc_dapm_new_controls(&codec->dapm, sn95031_dapm_widgets,
|
||||
ARRAY_SIZE(sn95031_dapm_widgets));
|
||||
if (ret)
|
||||
|
|
|
|||
Loading…
Reference in a new issue