nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 17:25:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

tegra-alt: dmic: Add output bit-width control

Browse Source 
"output bit format" ctl added to set TX CIF bit-width

Bug 1936284

Change-Id: Ifeec48c9c8adc50c5ec16c237b39451511a8ceb0
Signed-off-by: Viswanath L <viswanathl@nvidia.com>
Reviewed-on: http://git-master/r/1499297
Reviewed-by: Mohan Kumar D <mkumard@nvidia.com>
Reviewed-by: Sameer Pujar <spujar@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Ravindra Lokhande <rlokhande@nvidia.com>
This commit is contained in:
Viswanath L
2017-06-09 17:18:31 +05:30
committed by Sameer Pujar
parent 654d951c76
commit 725219888e
1 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
sound/soc/tegra-alt/tegra210_dmic_alt.c
View File

@@ -143,6 +143,12 @@ static int tegra210_dmic_set_dai_bclk_ratio(struct snd_soc_dai *dai,
return 0; return 0;
} }
static const int tegra210_dmic_fmt_values[] = {
0,
TEGRA210_AUDIOCIF_BITS_16,
TEGRA210_AUDIOCIF_BITS_32,
};
static int tegra210_dmic_hw_params(struct snd_pcm_substream *substream, static int tegra210_dmic_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params, struct snd_pcm_hw_params *params,
struct snd_soc_dai *dai) struct snd_soc_dai *dai)
@@ -265,6 +271,9 @@ static int tegra210_dmic_hw_params(struct snd_pcm_substream *substream,
return -EINVAL; return -EINVAL;
} }
if (dmic->format_out)
cif_conf.audio_bits = tegra210_dmic_fmt_values[dmic->format_out];
cif_conf.client_bits = TEGRA210_AUDIOCIF_BITS_24; cif_conf.client_bits = TEGRA210_AUDIOCIF_BITS_24;
dmic->soc_data->set_audio_cif(dmic->regmap, TEGRA210_DMIC_TX_CIF_CTRL, dmic->soc_data->set_audio_cif(dmic->regmap, TEGRA210_DMIC_TX_CIF_CTRL,
@@ -286,6 +295,8 @@ static int tegra210_dmic_get_control(struct snd_kcontrol *kcontrol,
else if (strstr(kcontrol->id.name, "TX mono to stereo")) else if (strstr(kcontrol->id.name, "TX mono to stereo"))
ucontrol->value.integer.value[0] = ucontrol->value.integer.value[0] =
dmic->tx_mono_to_stereo; dmic->tx_mono_to_stereo;
else if (strstr(kcontrol->id.name, "output bit format"))
ucontrol->value.integer.value[0] = dmic->format_out;
return 0; return 0;
} }
@@ -303,6 +314,8 @@ static int tegra210_dmic_put_control(struct snd_kcontrol *kcontrol,
dmic->ch_select = ucontrol->value.integer.value[0]; dmic->ch_select = ucontrol->value.integer.value[0];
else if (strstr(kcontrol->id.name, "TX mono to stereo")) else if (strstr(kcontrol->id.name, "TX mono to stereo"))
dmic->tx_mono_to_stereo = value; dmic->tx_mono_to_stereo = value;
else if (strstr(kcontrol->id.name, "output bit format"))
dmic->format_out = value;
return 0; return 0;
} }
@@ -379,6 +392,17 @@ static const struct soc_enum tegra210_dmic_mono_conv_enum =
ARRAY_SIZE(tegra210_dmic_mono_conv_text), ARRAY_SIZE(tegra210_dmic_mono_conv_text),
tegra210_dmic_mono_conv_text); tegra210_dmic_mono_conv_text);
static const char * const tegra210_dmic_format_text[] = {
"None",
"16",
"32",
};
static const struct soc_enum tegra210_dmic_format_enum =
SOC_ENUM_SINGLE(SND_SOC_NOPM, 0,
ARRAY_SIZE(tegra210_dmic_format_text),
tegra210_dmic_format_text);
static const struct snd_kcontrol_new tegra210_dmic_controls[] = { static const struct snd_kcontrol_new tegra210_dmic_controls[] = {
SOC_SINGLE_EXT("Boost Gain", 0, 0, 25600, 0, SOC_SINGLE_EXT("Boost Gain", 0, 0, 25600, 0,
tegra210_dmic_get_control, tegra210_dmic_put_control), tegra210_dmic_get_control, tegra210_dmic_put_control),
@@ -386,6 +410,8 @@ static const struct snd_kcontrol_new tegra210_dmic_controls[] = {
tegra210_dmic_get_control, tegra210_dmic_put_control), tegra210_dmic_get_control, tegra210_dmic_put_control),
SOC_ENUM_EXT("TX mono to stereo conv", tegra210_dmic_mono_conv_enum, SOC_ENUM_EXT("TX mono to stereo conv", tegra210_dmic_mono_conv_enum,
tegra210_dmic_get_control, tegra210_dmic_put_control), tegra210_dmic_get_control, tegra210_dmic_put_control),
SOC_ENUM_EXT("output bit format", tegra210_dmic_format_enum,
tegra210_dmic_get_control, tegra210_dmic_put_control),
}; };
static struct snd_soc_codec_driver tegra210_dmic_codec = { static struct snd_soc_codec_driver tegra210_dmic_codec = {