May 2011 - Alsa-devel - mailman.alsa-project.org

[PATCH 3/3] ASoC: codecs: max98088: Added digital mute function =
by Jin Park 11 May '11

11 May '11

in DAI1 and DAI2 Added digital mute function in DAI1 and DAI2. Signed-off-by: Jin Park <jinyoungp(a)nvidia.com> --- sound/soc/codecs/max98088.c | 32 ++++++++++++++++++++++++++++++++ sound/soc/codecs/max98088.h | 13 +++++++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c index c520093..b5ccf37 100644 --- a/sound/soc/codecs/max98088.c +++ b/sound/soc/codecs/max98088.c @@ -1582,6 +1582,36 @@ static int max98088_dai2_set_fmt(struct snd_soc_da= i *codec_dai, =20 return 0; } +static int max98088_dai1_digital_mute(struct snd_soc_dai *codec_dai, int= =20mute) +{ + struct snd_soc_codec *codec =3D codec_dai->codec; + int reg; + + if (mute) + reg =3D M98088_DAI_MUTE; + else + reg =3D 0; + + snd_soc_update_bits(codec, M98088_REG_2F_LVL_DAI1_PLAY, + M98088_DAI_MUTE_MASK, reg); + return 0; +} + +static int max98088_dai2_digital_mute(struct snd_soc_dai *codec_dai, int= =20mute) +{ + struct snd_soc_codec *codec =3D codec_dai->codec; + int reg; + + if (mute) + reg =3D M98088_DAI_MUTE; + else + reg =3D 0; + + snd_soc_update_bits(codec, M98088_REG_31_LVL_DAI2_PLAY, + M98088_DAI_MUTE_MASK, reg); + return 0; +} + static void max98088_sync_cache(struct snd_soc_codec *codec) { =20 u16 *reg_cache =3D codec->reg_cache; @@ -1643,12 +1673,14 @@ static struct snd_soc_dai_ops max98088_dai1_ops =3D= =20{ =20 .set_sysclk =3D max98088_dai_set_sysclk, =20 .set_fmt =3D max98088_dai1_set_fmt, =20 .hw_params =3D max98088_dai1_hw_params, + .digital_mute =3D max98088_dai1_digital_mute, }; =20static struct snd_soc_dai_ops max98088_dai2_ops =3D { =20 .set_sysclk =3D max98088_dai_set_sysclk, =20 .set_fmt =3D max98088_dai2_set_fmt, =20 .hw_params =3D max98088_dai2_hw_params, + .digital_mute =3D max98088_dai2_digital_mute, }; =20static struct snd_soc_dai_driver max98088_dai[] =3D { diff --git a/sound/soc/codecs/max98088.h b/sound/soc/codecs/max98088.h index 56554c7..be89a4f 100644 --- a/sound/soc/codecs/max98088.h +++ b/sound/soc/codecs/max98088.h @@ -133,6 +133,19 @@ =20 #define M98088_REC_LINEMODE (1<<7) =20 #define M98088_REC_LINEMODE_MASK (1<<7) +/* M98088_REG_2D_MIX_SPK_CNTL */ + #define M98088_MIX_SPKR_GAIN_MASK (3<<2) + #define M98088_MIX_SPKR_GAIN_SHIFT 2 + #define M98088_MIX_SPKL_GAIN_MASK (3<<0) + #define M98088_MIX_SPKL_GAIN_SHIFT 0 + +/* M98088_REG_2F_LVL_DAI1_PLAY, M98088_REG_31_LVL_DAI2_PLAY */ + #define M98088_DAI_MUTE (1<<7) + #define M98088_DAI_MUTE_MASK (1<<7) + #define M98088_DAI_VOICE_GAIN_MASK (3<<4) + #define M98088_DAI_ATTENUATION_MASK (0xF<<0) + #define M98088_DAI_ATTENUATION_SHIFT 0 + /* M98088_REG_35_LVL_MIC1, M98088_REG_36_LVL_MIC2 */ =20 #define M98088_MICPRE_MASK (3<<5) =20 #define M98088_MICPRE_SHIFT 5 -- 1.7.1 Best regards, Jinyoung. -------------------------------------------------------------------------= ---------- This email message is for the sole use of the intended recipient(s) and m= ay contain confidential information. Any unauthorized review, use, disclosure or di= stribution is prohibited. If you are not the intended recipient, please contact the= =20sender by reply email and destroy all copies of the original message. -------------------------------------------------------------------------= ----------

1 0

[PATCH 2/3] ASoC: codecs: max98088: Moved the EX Limiter Mode fr=
by Jin Park 11 May '11

11 May '11

om dapm widget to control Moved the EX Limiter Mode from dapm widget to control, because it was not= required DAPM route. Signed-off-by: Jin Park <jinyoungp(a)nvidia.com<mailto:jinyoungp@nvidia.com= >> --- sound/soc/codecs/max98088.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c index 3bdaa04..c520093 100644 --- a/sound/soc/codecs/max98088.c +++ b/sound/soc/codecs/max98088.c @@ -656,8 +656,6 @@ static const struct soc_enum max98088_exmode_enum =3D= =20 ARRAY_SIZE(max98088_exmode_texts), =20 max98088_exmode_texts, =20 max98088_exmode_values); -static const struct snd_kcontrol_new max98088_exmode_controls =3D - SOC_DAPM_VALUE_ENUM("Route", max98088_exmode_enum); =20static const char *max98088_ex_thresh[] =3D { /* volts PP */ =20 "0.6", "1.2", "1.8", "2.4", "3.0", "3.6", "4.2", "4.8"}; @@ -783,6 +781,7 @@ static const struct snd_kcontrol_new max98088_snd_con= trols[] =3D { =20 SOC_SINGLE("EQ1 Switch", M98088_REG_49_CFG_LEVEL, 0, 1, 0), =20 SOC_SINGLE("EQ2 Switch", M98088_REG_49_CFG_LEVEL, 1, 1, 0), + SOC_ENUM("EX Limiter Mode", max98088_exmode_enum), =20 SOC_ENUM("EX Limiter Threshold", max98088_ex_thresh_enum), =20 SOC_ENUM("DAI1 Filter Mode", max98088_filter_mode_enum), @@ -1094,9 +1093,6 @@ static const struct snd_soc_dapm_widget max98088_da= pm_widgets[] =3D { =20 SND_SOC_DAPM_MICBIAS("MICBIAS", M98088_REG_4C_PWR_EN_IN, 3, 0),= - SND_SOC_DAPM_MUX("EX Limiter Mode", SND_SOC_NOPM, 0, 0, - &max98088_exmode_controls), - =20 SND_SOC_DAPM_OUTPUT("HPL"), =20 SND_SOC_DAPM_OUTPUT("HPR"), =20 SND_SOC_DAPM_OUTPUT("SPKL"), -- 1.7.1 -------------------------------------------------------------------------= -----------------------------------------------------

1 0

[PATCH 2/3] ASoC: codecs: max98088: Moved the EX Limiter Mode fr=
by Jin Park 11 May '11

11 May '11

om dapm widget to control Moved the EX Limiter Mode from dapm widget to control, because it was not= required DAPM route. Signed-off-by: Jin Park <jinyoungp(a)nvidia.com<mailto:jinyoungp@nvidia.com= >> --- sound/soc/codecs/max98088.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c index 3bdaa04..c520093 100644 --- a/sound/soc/codecs/max98088.c +++ b/sound/soc/codecs/max98088.c @@ -656,8 +656,6 @@ static const struct soc_enum max98088_exmode_enum =3D= =20 ARRAY_SIZE(max98088_exmode_texts), =20 max98088_exmode_texts, =20 max98088_exmode_values); -static const struct snd_kcontrol_new max98088_exmode_controls =3D - SOC_DAPM_VALUE_ENUM("Route", max98088_exmode_enum); =20static const char *max98088_ex_thresh[] =3D { /* volts PP */ =20 "0.6", "1.2", "1.8", "2.4", "3.0", "3.6", "4.2", "4.8"}; @@ -783,6 +781,7 @@ static const struct snd_kcontrol_new max98088_snd_con= trols[] =3D { =20 SOC_SINGLE("EQ1 Switch", M98088_REG_49_CFG_LEVEL, 0, 1, 0), =20 SOC_SINGLE("EQ2 Switch", M98088_REG_49_CFG_LEVEL, 1, 1, 0), + SOC_ENUM("EX Limiter Mode", max98088_exmode_enum), =20 SOC_ENUM("EX Limiter Threshold", max98088_ex_thresh_enum), =20 SOC_ENUM("DAI1 Filter Mode", max98088_filter_mode_enum), @@ -1094,9 +1093,6 @@ static const struct snd_soc_dapm_widget max98088_da= pm_widgets[] =3D { =20 SND_SOC_DAPM_MICBIAS("MICBIAS", M98088_REG_4C_PWR_EN_IN, 3, 0),= - SND_SOC_DAPM_MUX("EX Limiter Mode", SND_SOC_NOPM, 0, 0, - &max98088_exmode_controls), - =20 SND_SOC_DAPM_OUTPUT("HPL"), =20 SND_SOC_DAPM_OUTPUT("HPR"), =20 SND_SOC_DAPM_OUTPUT("SPKL"), -- 1.7.1 -------------------------------------------------------------------------= -----------------------------------------------------

1 0

[PATCH 2/3] ASoC: codecs: max98088: Moved the EX Limiter Mode fr=
by Jin Park 11 May '11

11 May '11

om dapm widget to control Moved the EX Limiter Mode from dapm widget to control, because it was not= required DAPM route. Signed-off-by: Jin Park <jinyoungp(a)nvidia.com> --- sound/soc/codecs/max98088.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c index 3bdaa04..c520093 100644 --- a/sound/soc/codecs/max98088.c +++ b/sound/soc/codecs/max98088.c @@ -656,8 +656,6 @@ static const struct soc_enum max98088_exmode_enum =3D= =20 ARRAY_SIZE(max98088_exmode_texts), =20 max98088_exmode_texts, =20 max98088_exmode_values); -static const struct snd_kcontrol_new max98088_exmode_controls =3D - SOC_DAPM_VALUE_ENUM("Route", max98088_exmode_enum); =20static const char *max98088_ex_thresh[] =3D { /* volts PP */ =20 "0.6", "1.2", "1.8", "2.4", "3.0", "3.6", "4.2", "4.8"}; @@ -783,6 +781,7 @@ static const struct snd_kcontrol_new max98088_snd_con= trols[] =3D { =20 SOC_SINGLE("EQ1 Switch", M98088_REG_49_CFG_LEVEL, 0, 1, 0), =20 SOC_SINGLE("EQ2 Switch", M98088_REG_49_CFG_LEVEL, 1, 1, 0), + SOC_ENUM("EX Limiter Mode", max98088_exmode_enum), =20 SOC_ENUM("EX Limiter Threshold", max98088_ex_thresh_enum), =20 SOC_ENUM("DAI1 Filter Mode", max98088_filter_mode_enum), @@ -1094,9 +1093,6 @@ static const struct snd_soc_dapm_widget max98088_da= pm_widgets[] =3D { =20 SND_SOC_DAPM_MICBIAS("MICBIAS", M98088_REG_4C_PWR_EN_IN, 3, 0),= - SND_SOC_DAPM_MUX("EX Limiter Mode", SND_SOC_NOPM, 0, 0, - &max98088_exmode_controls), - =20 SND_SOC_DAPM_OUTPUT("HPL"), =20 SND_SOC_DAPM_OUTPUT("HPR"), =20 SND_SOC_DAPM_OUTPUT("SPKL"), -- 1.7.1 -------------------------------------------------------------------------= -----------------------------------------------------

1 0

[PATCH 1/3] ASoC: codecs: max98088: Fixed invalid register defin=
by Jin Park 11 May '11

11 May '11

itions in mixer controls Fixed invalid register definitions in mixer controls such as left speaker mixer, left hp mixer and left rec mixer. Signed-off-by: Jin Park <jinyoungp(a)nvidia.com<mailto:jinyoungp@nvidia.com= >> --- sound/soc/codecs/max98088.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c index 89498f9..3bdaa04 100644 --- a/sound/soc/codecs/max98088.c +++ b/sound/soc/codecs/max98088.c @@ -808,10 +808,10 @@ static const struct snd_kcontrol_new max98088_snd_c= ontrols[] =3D { =20/* Left speaker mixer switch */ static const struct snd_kcontrol_new max98088_left_speaker_mixer_controls= [] =3D { - SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_2B_MIX_SPK_LEFT, 7= , 1, 0), - SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_2B_MIX_SPK_LEFT, = 0, 1, 0), - SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_2B_MIX_SPK_LEFT, 7= , 1, 0), - SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_2B_MIX_SPK_LEFT, = 0, 1, 0), + SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_2B_MIX_SPK_LEFT, 0= , 1, 0), + SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_2B_MIX_SPK_LEFT, = 7, 1, 0), + SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_2B_MIX_SPK_LEFT, 0= , 1, 0), + SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_2B_MIX_SPK_LEFT, = 7, 1, 0), =20 SOC_DAPM_SINGLE("MIC1 Switch", M98088_REG_2B_MIX_SPK_LEFT, 5, 1= , 0), =20 SOC_DAPM_SINGLE("MIC2 Switch", M98088_REG_2B_MIX_SPK_LEFT, 6, 1= , 0), =20 SOC_DAPM_SINGLE("INA1 Switch", M98088_REG_2B_MIX_SPK_LEFT, 1, 1= , 0), @@ -836,10 +836,10 @@ static const struct snd_kcontrol_new max98088_right= _speaker_mixer_controls[] =3D { =20/* Left headphone mixer switch */ static const struct snd_kcontrol_new max98088_left_hp_mixer_controls[] =3D= =20{ - SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_25_MIX_HP_LEFT, 7,= =201, 0), - SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_25_MIX_HP_LEFT, 0= , 1, 0), - SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_25_MIX_HP_LEFT, 7,= =201, 0), - SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_25_MIX_HP_LEFT, 0= , 1, 0), + SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_25_MIX_HP_LEFT, 0,= =201, 0), + SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_25_MIX_HP_LEFT, 7= , 1, 0), + SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_25_MIX_HP_LEFT, 0,= =201, 0), + SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_25_MIX_HP_LEFT, 7= , 1, 0), =20 SOC_DAPM_SINGLE("MIC1 Switch", M98088_REG_25_MIX_HP_LEFT, 5, 1,= =200), =20 SOC_DAPM_SINGLE("MIC2 Switch", M98088_REG_25_MIX_HP_LEFT, 6, 1,= =200), =20 SOC_DAPM_SINGLE("INA1 Switch", M98088_REG_25_MIX_HP_LEFT, 1, 1,= =200), @@ -864,10 +864,10 @@ static const struct snd_kcontrol_new max98088_right= _hp_mixer_controls[] =3D { =20/* Left earpiece/receiver mixer switch */ static const struct snd_kcontrol_new max98088_left_rec_mixer_controls[] =3D= =20{ - SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_28_MIX_REC_LEFT, 7= , 1, 0), - SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_28_MIX_REC_LEFT, = 0, 1, 0), - SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_28_MIX_REC_LEFT, 7= , 1, 0), - SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_28_MIX_REC_LEFT, = 0, 1, 0), + SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_28_MIX_REC_LEFT, 0= , 1, 0), + SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_28_MIX_REC_LEFT, = 7, 1, 0), + SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_28_MIX_REC_LEFT, 0= , 1, 0), + SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_28_MIX_REC_LEFT, = 7, 1, 0), =20 SOC_DAPM_SINGLE("MIC1 Switch", M98088_REG_28_MIX_REC_LEFT, 5, 1= , 0), =20 SOC_DAPM_SINGLE("MIC2 Switch", M98088_REG_28_MIX_REC_LEFT, 6, 1= , 0), =20 SOC_DAPM_SINGLE("INA1 Switch", M98088_REG_28_MIX_REC_LEFT, 1, 1= , 0), -- 1.7.1 -------------------------------------------------------------------------= -----------------------------------------------------

1 0

[PATCH 1/3] ASoC: codecs: max98088: Fixed invalid register defin=
by Jin Park 11 May '11

11 May '11

itions in mixer controls Fixed invalid register definitions in mixer controls such as left speaker mixer, left hp mixer and left rec mixer. Signed-off-by: Jin Park <jinyoungp(a)nvidia.com<mailto:jinyoungp@nvidia.com= >> --- sound/soc/codecs/max98088.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c index 89498f9..3bdaa04 100644 --- a/sound/soc/codecs/max98088.c +++ b/sound/soc/codecs/max98088.c @@ -808,10 +808,10 @@ static const struct snd_kcontrol_new max98088_snd_c= ontrols[] =3D { =20/* Left speaker mixer switch */ static const struct snd_kcontrol_new max98088_left_speaker_mixer_controls= [] =3D { - SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_2B_MIX_SPK_LEFT, 7= , 1, 0), - SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_2B_MIX_SPK_LEFT, = 0, 1, 0), - SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_2B_MIX_SPK_LEFT, 7= , 1, 0), - SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_2B_MIX_SPK_LEFT, = 0, 1, 0), + SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_2B_MIX_SPK_LEFT, 0= , 1, 0), + SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_2B_MIX_SPK_LEFT, = 7, 1, 0), + SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_2B_MIX_SPK_LEFT, 0= , 1, 0), + SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_2B_MIX_SPK_LEFT, = 7, 1, 0), =20 SOC_DAPM_SINGLE("MIC1 Switch", M98088_REG_2B_MIX_SPK_LEFT, 5, 1= , 0), =20 SOC_DAPM_SINGLE("MIC2 Switch", M98088_REG_2B_MIX_SPK_LEFT, 6, 1= , 0), =20 SOC_DAPM_SINGLE("INA1 Switch", M98088_REG_2B_MIX_SPK_LEFT, 1, 1= , 0), @@ -836,10 +836,10 @@ static const struct snd_kcontrol_new max98088_right= _speaker_mixer_controls[] =3D { =20/* Left headphone mixer switch */ static const struct snd_kcontrol_new max98088_left_hp_mixer_controls[] =3D= =20{ - SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_25_MIX_HP_LEFT, 7,= =201, 0), - SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_25_MIX_HP_LEFT, 0= , 1, 0), - SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_25_MIX_HP_LEFT, 7,= =201, 0), - SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_25_MIX_HP_LEFT, 0= , 1, 0), + SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_25_MIX_HP_LEFT, 0,= =201, 0), + SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_25_MIX_HP_LEFT, 7= , 1, 0), + SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_25_MIX_HP_LEFT, 0,= =201, 0), + SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_25_MIX_HP_LEFT, 7= , 1, 0), =20 SOC_DAPM_SINGLE("MIC1 Switch", M98088_REG_25_MIX_HP_LEFT, 5, 1,= =200), =20 SOC_DAPM_SINGLE("MIC2 Switch", M98088_REG_25_MIX_HP_LEFT, 6, 1,= =200), =20 SOC_DAPM_SINGLE("INA1 Switch", M98088_REG_25_MIX_HP_LEFT, 1, 1,= =200), @@ -864,10 +864,10 @@ static const struct snd_kcontrol_new max98088_right= _hp_mixer_controls[] =3D { =20/* Left earpiece/receiver mixer switch */ static const struct snd_kcontrol_new max98088_left_rec_mixer_controls[] =3D= =20{ - SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_28_MIX_REC_LEFT, 7= , 1, 0), - SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_28_MIX_REC_LEFT, = 0, 1, 0), - SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_28_MIX_REC_LEFT, 7= , 1, 0), - SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_28_MIX_REC_LEFT, = 0, 1, 0), + SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_28_MIX_REC_LEFT, 0= , 1, 0), + SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_28_MIX_REC_LEFT, = 7, 1, 0), + SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_28_MIX_REC_LEFT, 0= , 1, 0), + SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_28_MIX_REC_LEFT, = 7, 1, 0), =20 SOC_DAPM_SINGLE("MIC1 Switch", M98088_REG_28_MIX_REC_LEFT, 5, 1= , 0), =20 SOC_DAPM_SINGLE("MIC2 Switch", M98088_REG_28_MIX_REC_LEFT, 6, 1= , 0), =20 SOC_DAPM_SINGLE("INA1 Switch", M98088_REG_28_MIX_REC_LEFT, 1, 1= , 0), -- 1.7.1 -------------------------------------------------------------------------= -----------------------------------------------------

1 0

[PATCH 1/3] ASoC: codecs: max98088: Fixed invalid register defin=
by Jin Park 11 May '11

11 May '11

itions in mixer controls Fixed invalid register definitions in mixer controls such as left speaker mixer, left hp mixer and left rec mixer. Signed-off-by: Jin Park <jinyoungp(a)nvidia.com> --- sound/soc/codecs/max98088.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c index 89498f9..3bdaa04 100644 --- a/sound/soc/codecs/max98088.c +++ b/sound/soc/codecs/max98088.c @@ -808,10 +808,10 @@ static const struct snd_kcontrol_new max98088_snd_c= ontrols[] =3D { =20/* Left speaker mixer switch */ static const struct snd_kcontrol_new max98088_left_speaker_mixer_controls= [] =3D { - SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_2B_MIX_SPK_LEFT, 7= , 1, 0), - SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_2B_MIX_SPK_LEFT, = 0, 1, 0), - SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_2B_MIX_SPK_LEFT, 7= , 1, 0), - SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_2B_MIX_SPK_LEFT, = 0, 1, 0), + SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_2B_MIX_SPK_LEFT, 0= , 1, 0), + SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_2B_MIX_SPK_LEFT, = 7, 1, 0), + SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_2B_MIX_SPK_LEFT, 0= , 1, 0), + SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_2B_MIX_SPK_LEFT, = 7, 1, 0), =20 SOC_DAPM_SINGLE("MIC1 Switch", M98088_REG_2B_MIX_SPK_LEFT, 5, 1= , 0), =20 SOC_DAPM_SINGLE("MIC2 Switch", M98088_REG_2B_MIX_SPK_LEFT, 6, 1= , 0), =20 SOC_DAPM_SINGLE("INA1 Switch", M98088_REG_2B_MIX_SPK_LEFT, 1, 1= , 0), @@ -836,10 +836,10 @@ static const struct snd_kcontrol_new max98088_right= _speaker_mixer_controls[] =3D { =20/* Left headphone mixer switch */ static const struct snd_kcontrol_new max98088_left_hp_mixer_controls[] =3D= =20{ - SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_25_MIX_HP_LEFT, 7,= =201, 0), - SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_25_MIX_HP_LEFT, 0= , 1, 0), - SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_25_MIX_HP_LEFT, 7,= =201, 0), - SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_25_MIX_HP_LEFT, 0= , 1, 0), + SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_25_MIX_HP_LEFT, 0,= =201, 0), + SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_25_MIX_HP_LEFT, 7= , 1, 0), + SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_25_MIX_HP_LEFT, 0,= =201, 0), + SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_25_MIX_HP_LEFT, 7= , 1, 0), =20 SOC_DAPM_SINGLE("MIC1 Switch", M98088_REG_25_MIX_HP_LEFT, 5, 1,= =200), =20 SOC_DAPM_SINGLE("MIC2 Switch", M98088_REG_25_MIX_HP_LEFT, 6, 1,= =200), =20 SOC_DAPM_SINGLE("INA1 Switch", M98088_REG_25_MIX_HP_LEFT, 1, 1,= =200), @@ -864,10 +864,10 @@ static const struct snd_kcontrol_new max98088_right= _hp_mixer_controls[] =3D { =20/* Left earpiece/receiver mixer switch */ static const struct snd_kcontrol_new max98088_left_rec_mixer_controls[] =3D= =20{ - SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_28_MIX_REC_LEFT, 7= , 1, 0), - SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_28_MIX_REC_LEFT, = 0, 1, 0), - SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_28_MIX_REC_LEFT, 7= , 1, 0), - SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_28_MIX_REC_LEFT, = 0, 1, 0), + SOC_DAPM_SINGLE("Left DAC1 Switch", M98088_REG_28_MIX_REC_LEFT, 0= , 1, 0), + SOC_DAPM_SINGLE("Right DAC1 Switch", M98088_REG_28_MIX_REC_LEFT, = 7, 1, 0), + SOC_DAPM_SINGLE("Left DAC2 Switch", M98088_REG_28_MIX_REC_LEFT, 0= , 1, 0), + SOC_DAPM_SINGLE("Right DAC2 Switch", M98088_REG_28_MIX_REC_LEFT, = 7, 1, 0), =20 SOC_DAPM_SINGLE("MIC1 Switch", M98088_REG_28_MIX_REC_LEFT, 5, 1= , 0), =20 SOC_DAPM_SINGLE("MIC2 Switch", M98088_REG_28_MIX_REC_LEFT, 6, 1= , 0), =20 SOC_DAPM_SINGLE("INA1 Switch", M98088_REG_28_MIX_REC_LEFT, 1, 1= , 0), -- 1.7.1 -------------------------------------------------------------------------= -----------------------------------------------------

1 0

[alsa-devel] [PATCH] CHROMIUM: ASoC: Remove 'const' modifiers which cause warnings during compilation.
by Taylor Hutt 11 May '11

11 May '11

This change removes a warning produced when 'const * const' values are assigned to a 'const **'. These code being modified originally came from these two commits: http://git.kernel.org/?p=linux/kernel/git/broonie/sound-2.6.git;a=commit;h=… http://git.kernel.org/?p=linux/kernel/git/broonie/sound-2.6.git;a=commit;h=… Change-Id: I964ff6d24aafe78c2db7002abfd03b9069db9687 Signed-off-by: Taylor Hutt <thutt(a)chromium.org> --- sound/soc/codecs/max98095.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c index a6cc94e..55f5d0f 100644 --- a/sound/soc/codecs/max98095.c +++ b/sound/soc/codecs/max98095.c @@ -678,7 +678,7 @@ static void m98095_biquad_band(struct snd_soc_codec *codec, unsigned int dai, } } -static const char * const max98095_fltr_mode[] = { "Voice", "Music" }; +static const char *max98095_fltr_mode[] = { "Voice", "Music" }; static const struct soc_enum max98095_dai1_filter_mode_enum[] = { SOC_ENUM_SINGLE(M98095_02E_DAI1_FILTERS, 7, 2, max98095_fltr_mode), }; @@ -686,7 +686,7 @@ static const struct soc_enum max98095_dai2_filter_mode_enum[] = { SOC_ENUM_SINGLE(M98095_038_DAI2_FILTERS, 7, 2, max98095_fltr_mode), }; -static const char * const max98095_extmic_text[] = { "None", "MIC1", "MIC2" }; +static const char *max98095_extmic_text[] = { "None", "MIC1", "MIC2" }; static const struct soc_enum max98095_extmic_enum = SOC_ENUM_SINGLE(M98095_087_CFG_MIC, 0, 3, max98095_extmic_text); @@ -694,24 +694,22 @@ static const struct soc_enum max98095_extmic_enum = static const struct snd_kcontrol_new max98095_extmic_mux = SOC_DAPM_ENUM("External MIC Mux", max98095_extmic_enum); -static const char * const max98095_linein_text[] = { "INA", "INB" }; - +static const char *max98095_linein_text[] = { "INA", "INB" }; static const struct soc_enum max98095_linein_enum = SOC_ENUM_SINGLE(M98095_086_CFG_LINE, 6, 2, max98095_linein_text); static const struct snd_kcontrol_new max98095_linein_mux = SOC_DAPM_ENUM("Linein Input Mux", max98095_linein_enum); -static const char * const max98095_line_mode_text[] = { +static const char *max98095_line_mode_text[] = { "Stereo", "Differential"}; - static const struct soc_enum max98095_linein_mode_enum = SOC_ENUM_SINGLE(M98095_086_CFG_LINE, 7, 2, max98095_line_mode_text); static const struct soc_enum max98095_lineout_mode_enum = SOC_ENUM_SINGLE(M98095_086_CFG_LINE, 4, 2, max98095_line_mode_text); -static const char * const max98095_dai_fltr[] = { +static const char *max98095_dai_fltr[] = { "Off", "Elliptical-HPF-16k", "Butterworth-HPF-16k", "Elliptical-HPF-8k", "Butterworth-HPF-8k", "Butterworth-HPF-Fs/240"}; static const struct soc_enum max98095_dai1_dac_filter_enum[] = { -- 1.7.3.1

2 1

[alsa-devel] --separate-channels issues
by hong zhang 10 May '11

10 May '11

Takashi, When I run following commands with 2 pins inputs. $ arecord -f S16_LE -r 48000 -c 4 -D plughw:0,1 --separate-channels c1.wav c2.wav c3.wav c4.wav hd c3.wav and c4.wav returns 0 but c1.wav and c2.wav got right data. Such as $ hd c3.wav 00000000 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * 005ad000 Also, I see trigger Rx start command and then stop command immediately. Any hint to look into? Thanks. ---henry

2 3

[alsa-devel] [PATCH] ASoC: WM8903: Fix Digital Capture Volume range
by Stephen Warren 10 May '11

10 May '11

Increase the range of the Digital Capture Volume control to be 120 steps. Each step is 0.75dB, and the range starts at -72dB, giving a max setting of 18dB, which matches the latest datasheet, to the precision of the step size. Tested-on: Seaboard non-clamshell. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- sound/soc/codecs/wm8903.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index f3cab84..957cd66 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c @@ -699,7 +699,7 @@ SOC_ENUM("DRC Smoothing Threshold", drc_smoothing), SOC_SINGLE_TLV("DRC Startup Volume", WM8903_DRC_0, 6, 18, 0, drc_tlv_startup), SOC_DOUBLE_R_TLV("Digital Capture Volume", WM8903_ADC_DIGITAL_VOLUME_LEFT, - WM8903_ADC_DIGITAL_VOLUME_RIGHT, 1, 96, 0, digital_tlv), + WM8903_ADC_DIGITAL_VOLUME_RIGHT, 1, 120, 0, digital_tlv), SOC_ENUM("ADC Companding Mode", adc_companding), SOC_SINGLE("ADC Companding Switch", WM8903_AUDIO_INTERFACE_0, 3, 1, 0), -- 1.7.0.4

3 2