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

ASoC: tegra-alt: Rename ADMAIF RX/TX controls

Browse Source 
The ADMAIF RX/TX cif conversion mixer controls are renamed as
ADMAIF Playback/Capture which will be more meaningful for the
userspace to understand.

Bug 200500656

Signed-off-by: Mohan Kumar <mkumard@nvidia.com>

Change-Id: I046b7653b7c386a5ab393bffe654d2758685869e
Signed-off-by: Mohan Kumar <mkumard@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2078005
GVS: Gerrit_Virtual_Submit
Reviewed-by: Jonathan Hunter <jonathanh@nvidia.com>
Reviewed-by: Ravindra Lokhande <rlokhande@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Mohan Kumar
2019-03-21 11:39:23 +05:30
committed by Sameer Pujar
parent 006ee15c23
commit c9afbf06b8
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sound/soc/tegra-alt/tegra210_admaif_alt.c
View File

@@ -540,13 +540,13 @@ static int tegra_admaif_get_format(struct snd_kcontrol *kcontrol,
admaif->override_channels[mc->reg]; admaif->override_channels[mc->reg];
else { else {
for (i = 0 ; i < admaif->soc_data->num_ch; i++) { for (i = 0 ; i < admaif->soc_data->num_ch; i++) {
snprintf(buf, 50, "ADMAIF%d RX stereo to mono", i+1); snprintf(buf, 50, "ADMAIF%d Capture stereo to mono", i+1);
if (strstr(kcontrol->id.name, buf)) { if (strstr(kcontrol->id.name, buf)) {
ucontrol->value.integer.value[0] = ucontrol->value.integer.value[0] =
admaif->rx_stereo_to_mono[i]; admaif->rx_stereo_to_mono[i];
break; break;
} }
snprintf(buf, 50, "ADMAIF%d TX mono to stereo", i+1); snprintf(buf, 50, "ADMAIF%d Playback mono to stereo", i+1);
if (strstr(kcontrol->id.name, buf)) { if (strstr(kcontrol->id.name, buf)) {
ucontrol->value.integer.value[0] = ucontrol->value.integer.value[0] =
admaif->tx_mono_to_stereo[i]; admaif->tx_mono_to_stereo[i];
@@ -576,12 +576,12 @@ static int tegra_admaif_put_format(struct snd_kcontrol *kcontrol,
return -EINVAL; return -EINVAL;
} else { } else {
for (i = 0 ; i < admaif->soc_data->num_ch; i++) { for (i = 0 ; i < admaif->soc_data->num_ch; i++) {
snprintf(buf, 50, "ADMAIF%d RX stereo to mono", i+1); snprintf(buf, 50, "ADMAIF%d Capture stereo to mono", i+1);
if (strstr(kcontrol->id.name, buf)) { if (strstr(kcontrol->id.name, buf)) {
admaif->rx_stereo_to_mono[i] = value; admaif->rx_stereo_to_mono[i] = value;
break; break;
} }
snprintf(buf, 50, "ADMAIF%d TX mono to stereo", i+1); snprintf(buf, 50, "ADMAIF%d Playback mono to stereo", i+1);
if (strstr(kcontrol->id.name, buf)) { if (strstr(kcontrol->id.name, buf)) {
admaif->tx_mono_to_stereo[i] = value; admaif->tx_mono_to_stereo[i] = value;
break; break;
@@ -928,12 +928,12 @@ static const struct soc_enum tegra_admaif_stereo_conv_enum =
tegra_admaif_get_format, tegra_admaif_put_format) tegra_admaif_get_format, tegra_admaif_put_format)
#define TEGRA_ADMAIF_TX_CIF_CTRL(reg) \ #define TEGRA_ADMAIF_TX_CIF_CTRL(reg) \
SOC_ENUM_EXT("ADMAIF" #reg " TX mono to stereo conv", \ SOC_ENUM_EXT("ADMAIF" #reg " Playback mono to stereo conv", \
tegra_admaif_mono_conv_enum, tegra_admaif_get_format, \ tegra_admaif_mono_conv_enum, tegra_admaif_get_format, \
tegra_admaif_put_format) tegra_admaif_put_format)
#define TEGRA_ADMAIF_RX_CIF_CTRL(reg) \ #define TEGRA_ADMAIF_RX_CIF_CTRL(reg) \
SOC_ENUM_EXT("ADMAIF" #reg " RX stereo to mono conv", \ SOC_ENUM_EXT("ADMAIF" #reg " Capture stereo to mono conv", \
tegra_admaif_stereo_conv_enum, tegra_admaif_get_format, \ tegra_admaif_stereo_conv_enum, tegra_admaif_get_format, \
tegra_admaif_put_format) tegra_admaif_put_format)