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: Rename MVC mixer controls

Browse Source 
Similar to upstreamed AHUB drivers, follow standard naming convention
for MVC mixer controls. Right now there is no requirement to have
separate channel or bit format controls on input/output and AHUB/client
side. Single channel or bit format control is used for all. Hence rename
bit format control to look consistent with channel control.

Bug 200698314

Change-Id: I76976823d03ef3e3a47346aa928c11f9b26052c6
Signed-off-by: Sameer Pujar <spujar@nvidia.com>
This commit is contained in:
Sameer Pujar
2021-05-03 18:15:31 +05:30
parent 48bff81383
commit 72643a1be8
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sound/soc/tegra/tegra210_mvc.c
View File

@@ -237,9 +237,9 @@ static int tegra210_mvc_get_format(struct snd_kcontrol *kcontrol,
struct tegra210_mvc *mvc = snd_soc_component_get_drvdata(cmpnt); struct tegra210_mvc *mvc = snd_soc_component_get_drvdata(cmpnt);
/* get the format control flag */ /* get the format control flag */
if (strstr(kcontrol->id.name, "input bit format")) if (strstr(kcontrol->id.name, "Audio Bit Format"))
ucontrol->value.integer.value[0] = mvc->format_in; ucontrol->value.integer.value[0] = mvc->format_in;
else if (strstr(kcontrol->id.name, "Channels")) else if (strstr(kcontrol->id.name, "Audio Channels"))
ucontrol->value.integer.value[0] = mvc->cif_channels; ucontrol->value.integer.value[0] = mvc->cif_channels;
return 0; return 0;
@@ -253,9 +253,9 @@ static int tegra210_mvc_put_format(struct snd_kcontrol *kcontrol,
unsigned int value = ucontrol->value.integer.value[0]; unsigned int value = ucontrol->value.integer.value[0];
/* set the format control flag */ /* set the format control flag */
if (strstr(kcontrol->id.name, "input bit format")) if (strstr(kcontrol->id.name, "Audio Bit Format"))
mvc->format_in = value; mvc->format_in = value;
else if (strstr(kcontrol->id.name, "Channels")) else if (strstr(kcontrol->id.name, "Audio Channels"))
mvc->cif_channels = value; mvc->cif_channels = value;
return 0; return 0;
@@ -411,7 +411,7 @@ static const struct soc_enum tegra210_mvc_format_enum =
tegra210_mvc_format_text); tegra210_mvc_format_text);
static const struct snd_kcontrol_new tegra210_mvc_vol_ctrl[] = { static const struct snd_kcontrol_new tegra210_mvc_vol_ctrl[] = {
SOC_SINGLE_EXT("Vol", TEGRA210_MVC_TARGET_VOL, 0, 16000, 0, SOC_SINGLE_EXT("Volume", TEGRA210_MVC_TARGET_VOL, 0, 16000, 0,
tegra210_mvc_get_vol, tegra210_mvc_put_vol), tegra210_mvc_get_vol, tegra210_mvc_put_vol),
SOC_SINGLE_EXT("Mute", TEGRA210_MVC_CTRL, 0, 1, 0, SOC_SINGLE_EXT("Mute", TEGRA210_MVC_CTRL, 0, 1, 0,
tegra210_mvc_get_vol, tegra210_mvc_put_vol), tegra210_mvc_get_vol, tegra210_mvc_put_vol),
@@ -419,9 +419,9 @@ static const struct snd_kcontrol_new tegra210_mvc_vol_ctrl[] = {
tegra210_mvc_get_curve_type, tegra210_mvc_put_curve_type), tegra210_mvc_get_curve_type, tegra210_mvc_put_curve_type),
SOC_SINGLE_EXT("Bits", 0, 0, 32, 0, SOC_SINGLE_EXT("Bits", 0, 0, 32, 0,
tegra210_mvc_get_audio_bits, tegra210_mvc_put_audio_bits), tegra210_mvc_get_audio_bits, tegra210_mvc_put_audio_bits),
SOC_SINGLE_EXT("Channels", 0, 0, 8, 0, SOC_SINGLE_EXT("Audio Channels", 0, 0, 8, 0,
tegra210_mvc_get_format, tegra210_mvc_put_format), tegra210_mvc_get_format, tegra210_mvc_put_format),
SOC_ENUM_EXT("input bit format", tegra210_mvc_format_enum, SOC_ENUM_EXT("Audio Bit Format", tegra210_mvc_format_enum,
tegra210_mvc_get_format, tegra210_mvc_put_format), tegra210_mvc_get_format, tegra210_mvc_put_format),
}; };