iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: TWL4030: Convert the bitfield enums to VALUE_ENUM type

Browse Source 
Convert the bitfield coded enums to the new VALUE_ENUM type.
Remove the enum check, since the VALUE_ENUM type can handle
the bitfield coding and also handles the 'holes' in the bitfield.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Peter Ujfalusi 2009-01-05 09:54:58 +02:00 committed by Mark Brown
parent 2e72f8e371
commit 2f42357722
1 changed files with 55 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
sound/soc/codecs/twl4030.c
View File

@ -192,39 +192,51 @@ static void twl4030_init_chip(struct snd_soc_codec *codec)
/* Earpiece */ /* Earpiece */
static const char *twl4030_earpiece_texts[] = static const char *twl4030_earpiece_texts[] =
{"Off", "DACL1", "DACL2", "Invalid", "DACR1"}; {"Off", "DACL1", "DACL2", "DACR1"};
static const struct soc_enum twl4030_earpiece_enum = static const unsigned int twl4030_earpiece_values[] =
SOC_ENUM_SINGLE(TWL4030_REG_EAR_CTL, 1, {0x0, 0x1, 0x2, 0x4};
static const struct soc_value_enum twl4030_earpiece_enum =
SOC_VALUE_ENUM_SINGLE(TWL4030_REG_EAR_CTL, 1, 0x7,
ARRAY_SIZE(twl4030_earpiece_texts), ARRAY_SIZE(twl4030_earpiece_texts),
twl4030_earpiece_texts); twl4030_earpiece_texts,
twl4030_earpiece_values);
static const struct snd_kcontrol_new twl4030_dapm_earpiece_control = static const struct snd_kcontrol_new twl4030_dapm_earpiece_control =
SOC_DAPM_ENUM("Route", twl4030_earpiece_enum); SOC_DAPM_VALUE_ENUM("Route", twl4030_earpiece_enum);
/* PreDrive Left */ /* PreDrive Left */
static const char *twl4030_predrivel_texts[] = static const char *twl4030_predrivel_texts[] =
{"Off", "DACL1", "DACL2", "Invalid", "DACR2"}; {"Off", "DACL1", "DACL2", "DACR2"};
static const struct soc_enum twl4030_predrivel_enum = static const unsigned int twl4030_predrivel_values[] =
SOC_ENUM_SINGLE(TWL4030_REG_PREDL_CTL, 1, {0x0, 0x1, 0x2, 0x4};
static const struct soc_value_enum twl4030_predrivel_enum =
SOC_VALUE_ENUM_SINGLE(TWL4030_REG_PREDL_CTL, 1, 0x7,
ARRAY_SIZE(twl4030_predrivel_texts), ARRAY_SIZE(twl4030_predrivel_texts),
twl4030_predrivel_texts); twl4030_predrivel_texts,
twl4030_predrivel_values);
static const struct snd_kcontrol_new twl4030_dapm_predrivel_control = static const struct snd_kcontrol_new twl4030_dapm_predrivel_control =
SOC_DAPM_ENUM("Route", twl4030_predrivel_enum); SOC_DAPM_VALUE_ENUM("Route", twl4030_predrivel_enum);
/* PreDrive Right */ /* PreDrive Right */
static const char *twl4030_predriver_texts[] = static const char *twl4030_predriver_texts[] =
{"Off", "DACR1", "DACR2", "Invalid", "DACL2"}; {"Off", "DACR1", "DACR2", "DACL2"};
static const struct soc_enum twl4030_predriver_enum = static const unsigned int twl4030_predriver_values[] =
SOC_ENUM_SINGLE(TWL4030_REG_PREDR_CTL, 1, {0x0, 0x1, 0x2, 0x4};
static const struct soc_value_enum twl4030_predriver_enum =
SOC_VALUE_ENUM_SINGLE(TWL4030_REG_PREDR_CTL, 1, 0x7,
ARRAY_SIZE(twl4030_predriver_texts), ARRAY_SIZE(twl4030_predriver_texts),
twl4030_predriver_texts); twl4030_predriver_texts,
twl4030_predriver_values);
static const struct snd_kcontrol_new twl4030_dapm_predriver_control = static const struct snd_kcontrol_new twl4030_dapm_predriver_control =
SOC_DAPM_ENUM("Route", twl4030_predriver_enum); SOC_DAPM_VALUE_ENUM("Route", twl4030_predriver_enum);
/* Headset Left */ /* Headset Left */
static const char *twl4030_hsol_texts[] = static const char *twl4030_hsol_texts[] =
@ -300,28 +312,35 @@ SOC_DAPM_ENUM("Route", twl4030_handsfreer_enum);
/* Left analog microphone selection */ /* Left analog microphone selection */
static const char *twl4030_analoglmic_texts[] = static const char *twl4030_analoglmic_texts[] =
{"Off", "Main mic", "Headset mic", "Invalid", "AUXL", {"Off", "Main mic", "Headset mic", "AUXL", "Carkit mic"};
"Invalid", "Invalid", "Invalid", "Carkit mic"};
static const struct soc_enum twl4030_analoglmic_enum = static const unsigned int twl4030_analoglmic_values[] =
SOC_ENUM_SINGLE(TWL4030_REG_ANAMICL, 0, {0x0, 0x1, 0x2, 0x4, 0x8};
static const struct soc_value_enum twl4030_analoglmic_enum =
SOC_VALUE_ENUM_SINGLE(TWL4030_REG_ANAMICL, 0, 0xf,
ARRAY_SIZE(twl4030_analoglmic_texts), ARRAY_SIZE(twl4030_analoglmic_texts),
twl4030_analoglmic_texts); twl4030_analoglmic_texts,
twl4030_analoglmic_values);
static const struct snd_kcontrol_new twl4030_dapm_analoglmic_control = static const struct snd_kcontrol_new twl4030_dapm_analoglmic_control =
SOC_DAPM_ENUM("Route", twl4030_analoglmic_enum); SOC_DAPM_VALUE_ENUM("Route", twl4030_analoglmic_enum);
/* Right analog microphone selection */ /* Right analog microphone selection */
static const char *twl4030_analogrmic_texts[] = static const char *twl4030_analogrmic_texts[] =
{"Off", "Sub mic", "Invalid", "Invalid", "AUXR"}; {"Off", "Sub mic", "AUXR"};
static const struct soc_enum twl4030_analogrmic_enum = static const unsigned int twl4030_analogrmic_values[] =
SOC_ENUM_SINGLE(TWL4030_REG_ANAMICR, 0, {0x0, 0x1, 0x4};
static const struct soc_value_enum twl4030_analogrmic_enum =
SOC_VALUE_ENUM_SINGLE(TWL4030_REG_ANAMICR, 0, 0x5,
ARRAY_SIZE(twl4030_analogrmic_texts), ARRAY_SIZE(twl4030_analogrmic_texts),
twl4030_analogrmic_texts); twl4030_analogrmic_texts,
twl4030_analogrmic_values);
static const struct snd_kcontrol_new twl4030_dapm_analogrmic_control = static const struct snd_kcontrol_new twl4030_dapm_analogrmic_control =
SOC_DAPM_ENUM("Route", twl4030_analogrmic_enum); SOC_DAPM_VALUE_ENUM("Route", twl4030_analogrmic_enum);
/* TX1 L/R Analog/Digital microphone selection */ /* TX1 L/R Analog/Digital microphone selection */
static const char *twl4030_micpathtx1_texts[] = static const char *twl4030_micpathtx1_texts[] =
@ -347,28 +366,6 @@ static const struct soc_enum twl4030_micpathtx2_enum =
static const struct snd_kcontrol_new twl4030_dapm_micpathtx2_control = static const struct snd_kcontrol_new twl4030_dapm_micpathtx2_control =
SOC_DAPM_ENUM("Route", twl4030_micpathtx2_enum); SOC_DAPM_ENUM("Route", twl4030_micpathtx2_enum);
/*
* This function filters out the non valid mux settings, named as "Invalid"
* in the enum texts.
* Just refuse to set an invalid mux mode.
*/
static int twl4030_enum_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event)
{
struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
int ret = 0;
int val;
val = w->value >> e->shift_l;
if (!strcmp("Invalid", e->texts[val])) {
printk(KERN_WARNING "Invalid MUX setting on 0x%02x (%d)\n",
e->reg, val);
ret = -1;
}
return ret;
}
static int micpath_event(struct snd_soc_dapm_widget *w, static int micpath_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
@ -737,16 +734,13 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = {
/* Output MUX controls */ /* Output MUX controls */
/* Earpiece */ /* Earpiece */
SND_SOC_DAPM_MUX_E("Earpiece Mux", SND_SOC_NOPM, 0, 0, SND_SOC_DAPM_VALUE_MUX("Earpiece Mux", SND_SOC_NOPM, 0, 0,
&twl4030_dapm_earpiece_control, twl4030_enum_event, &twl4030_dapm_earpiece_control),
SND_SOC_DAPM_PRE_REG),
/* PreDrivL/R */ /* PreDrivL/R */
SND_SOC_DAPM_MUX_E("PredriveL Mux", SND_SOC_NOPM, 0, 0, SND_SOC_DAPM_VALUE_MUX("PredriveL Mux", SND_SOC_NOPM, 0, 0,
&twl4030_dapm_predrivel_control, twl4030_enum_event, &twl4030_dapm_predrivel_control),
SND_SOC_DAPM_PRE_REG), SND_SOC_DAPM_VALUE_MUX("PredriveR Mux", SND_SOC_NOPM, 0, 0,
SND_SOC_DAPM_MUX_E("PredriveR Mux", SND_SOC_NOPM, 0, 0, &twl4030_dapm_predriver_control),
&twl4030_dapm_predriver_control, twl4030_enum_event,
SND_SOC_DAPM_PRE_REG),
/* HeadsetL/R */ /* HeadsetL/R */
SND_SOC_DAPM_MUX("HeadsetL Mux", SND_SOC_NOPM, 0, 0, SND_SOC_DAPM_MUX("HeadsetL Mux", SND_SOC_NOPM, 0, 0,
&twl4030_dapm_hsol_control), &twl4030_dapm_hsol_control),
@ -789,12 +783,10 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = {
SND_SOC_DAPM_POST_REG), SND_SOC_DAPM_POST_REG),
/* Analog input muxes with power switch for the physical ADCL/R */ /* Analog input muxes with power switch for the physical ADCL/R */
SND_SOC_DAPM_MUX_E("Analog Left Capture Route", SND_SOC_DAPM_VALUE_MUX("Analog Left Capture Route",
TWL4030_REG_AVADC_CTL, 3, 0, &twl4030_dapm_analoglmic_control, TWL4030_REG_AVADC_CTL, 3, 0, &twl4030_dapm_analoglmic_control),
twl4030_enum_event, SND_SOC_DAPM_PRE_REG), SND_SOC_DAPM_VALUE_MUX("Analog Right Capture Route",
SND_SOC_DAPM_MUX_E("Analog Right Capture Route", TWL4030_REG_AVADC_CTL, 1, 0, &twl4030_dapm_analogrmic_control),
TWL4030_REG_AVADC_CTL, 1, 0, &twl4030_dapm_analogrmic_control,
twl4030_enum_event, SND_SOC_DAPM_PRE_REG),
SND_SOC_DAPM_PGA("Analog Left Amplifier", SND_SOC_DAPM_PGA("Analog Left Amplifier",
TWL4030_REG_ANAMICL, 4, 0, NULL, 0), TWL4030_REG_ANAMICL, 4, 0, NULL, 0),