From 5604eb841f9dbce6c9fc2ab9ead9f5d12a7d423a Mon Sep 17 00:00:00 2001 From: Sameer Pujar Date: Mon, 3 May 2021 20:58:02 +0530 Subject: [PATCH] ASoC: tegra: Rename AMX/ADX mixer controls Similar to upstreamed AHUB drivers, follow standard naming convention for AMX/ADX mixer controls. Thus update channel mixer controls. Bug 200698314 Change-Id: If1e2252392493435203e28cb9b232a8fcdf7fadc Signed-off-by: Sameer Pujar --- sound/soc/tegra/tegra210_adx.c | 4 ++-- sound/soc/tegra/tegra210_amx.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sound/soc/tegra/tegra210_adx.c b/sound/soc/tegra/tegra210_adx.c index 2a86d12b..06af73ea 100644 --- a/sound/soc/tegra/tegra210_adx.c +++ b/sound/soc/tegra/tegra210_adx.c @@ -544,12 +544,12 @@ static const struct snd_soc_dapm_route tegra210_adx_routes[] = { tegra210_adx_put_byte_map) #define TEGRA210_ADX_OUTPUT_CHANNELS_CTRL(reg) \ - SOC_SINGLE_EXT("Output" #reg " Channels", reg, 0, 16, 0, \ + SOC_SINGLE_EXT("Output" #reg " Audio Channels", reg, 0, 16, 0, \ tegra210_adx_get_out_channels, \ tegra210_adx_put_out_channels) #define TEGRA210_ADX_INPUT_CHANNELS_CTRL(reg) \ - SOC_SINGLE_EXT("Input Channels", reg, 0, 16, 0, \ + SOC_SINGLE_EXT("Input Audio Channels", reg, 0, 16, 0, \ tegra210_adx_get_in_channels, \ tegra210_adx_put_in_channels) diff --git a/sound/soc/tegra/tegra210_amx.c b/sound/soc/tegra/tegra210_amx.c index cf45b40c..4d3f6257 100644 --- a/sound/soc/tegra/tegra210_amx.c +++ b/sound/soc/tegra/tegra210_amx.c @@ -477,10 +477,10 @@ static int tegra210_amx_get_channels(struct snd_kcontrol *kcontrol, int reg = mc->reg; char buf[50]; - snprintf(buf, 50, "Input%d Channels", reg); + snprintf(buf, 50, "Input%d Audio Channels", reg); if (strstr(kcontrol->id.name, buf)) ucontrol->value.integer.value[0] = amx->input_channels[reg - 1]; - else if (strstr(kcontrol->id.name, "Output Channels")) + else if (strstr(kcontrol->id.name, "Output Audio Channels")) ucontrol->value.integer.value[0] = amx->output_channels; return 0; @@ -497,13 +497,13 @@ static int tegra210_amx_put_channels(struct snd_kcontrol *kcontrol, int value = ucontrol->value.integer.value[0]; char buf[50]; - snprintf(buf, 50, "Input%d Channels", reg); + snprintf(buf, 50, "Input%d Audio Channels", reg); if (strstr(kcontrol->id.name, buf)) { if (value >= 0 && value <= 16) amx->input_channels[reg - 1] = value; else return -EINVAL; - } else if (strstr(kcontrol->id.name, "Output Channels")) { + } else if (strstr(kcontrol->id.name, "Output Audio Channels")) { if (value >= 0 && value <= 16) amx->output_channels = value; else @@ -583,12 +583,12 @@ static const struct snd_soc_dapm_route tegra210_amx_routes[] = { tegra210_amx_get_byte_map, tegra210_amx_put_byte_map) #define TEGRA210_AMX_OUTPUT_CHANNELS_CTRL(reg) \ - SOC_SINGLE_EXT("Output Channels", reg, 0, 16, 0, \ + SOC_SINGLE_EXT("Output Audio Channels", reg, 0, 16, 0, \ tegra210_amx_get_channels, \ tegra210_amx_put_channels) #define TEGRA210_AMX_INPUT_CHANNELS_CTRL(reg) \ - SOC_SINGLE_EXT("Input" #reg " Channels", reg, 0, 16, 0, \ + SOC_SINGLE_EXT("Input" #reg " Audio Channels", reg, 0, 16, 0, \ tegra210_amx_get_channels, \ tegra210_amx_put_channels)