Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 230408
b: refs/heads/master
c: 370a031
h: refs/heads/master
v: v3
  • Loading branch information
Jorge Eduardo Candelaria authored and Liam Girdwood committed Dec 14, 2010
1 parent bb0f5e9 commit 4679b7a
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 28 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cf370a5a0e9d3b111f93216a55f275d66daed952
refs/heads/master: 370a0314ff3e1315e7fdec32a88a7ae49ccd22c8
100 changes: 73 additions & 27 deletions trunk/sound/soc/codecs/twl6040.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,12 @@ static DECLARE_TLV_DB_SCALE(mic_preamp_tlv, -600, 600, 0);
*/
static DECLARE_TLV_DB_SCALE(mic_amp_tlv, 600, 600, 0);

/*
* AFMGAIN volume control:
* from 18 to 24 dB in 6 dB steps
*/
static DECLARE_TLV_DB_SCALE(afm_amp_tlv, 1800, 600, 0);

/*
* HSGAIN volume control:
* from -30 to 0 dB in 2 dB steps
Expand Down Expand Up @@ -506,25 +512,47 @@ static const struct soc_enum twl6040_enum[] = {
SOC_ENUM_SINGLE(TWL6040_REG_MICRCTL, 3, 3, twl6040_amicr_texts),
};

static const char *twl6040_hs_texts[] = {
"Off", "HS DAC", "Line-In amp"
};

static const struct soc_enum twl6040_hs_enum[] = {
SOC_ENUM_SINGLE(TWL6040_REG_HSLCTL, 5, ARRAY_SIZE(twl6040_hs_texts),
twl6040_hs_texts),
SOC_ENUM_SINGLE(TWL6040_REG_HSRCTL, 5, ARRAY_SIZE(twl6040_hs_texts),
twl6040_hs_texts),
};

static const char *twl6040_hf_texts[] = {
"Off", "HF DAC", "Line-In amp"
};

static const struct soc_enum twl6040_hf_enum[] = {
SOC_ENUM_SINGLE(TWL6040_REG_HFLCTL, 2, ARRAY_SIZE(twl6040_hf_texts),
twl6040_hf_texts),
SOC_ENUM_SINGLE(TWL6040_REG_HFRCTL, 2, ARRAY_SIZE(twl6040_hf_texts),
twl6040_hf_texts),
};

static const struct snd_kcontrol_new amicl_control =
SOC_DAPM_ENUM("Route", twl6040_enum[0]);

static const struct snd_kcontrol_new amicr_control =
SOC_DAPM_ENUM("Route", twl6040_enum[1]);

/* Headset DAC playback switches */
static const struct snd_kcontrol_new hsdacl_switch_controls =
SOC_DAPM_SINGLE("Switch", TWL6040_REG_HSLCTL, 5, 1, 0);
static const struct snd_kcontrol_new hsl_mux_controls =
SOC_DAPM_ENUM("Route", twl6040_hs_enum[0]);

static const struct snd_kcontrol_new hsdacr_switch_controls =
SOC_DAPM_SINGLE("Switch", TWL6040_REG_HSRCTL, 5, 1, 0);
static const struct snd_kcontrol_new hsr_mux_controls =
SOC_DAPM_ENUM("Route", twl6040_hs_enum[1]);

/* Handsfree DAC playback switches */
static const struct snd_kcontrol_new hfdacl_switch_controls =
SOC_DAPM_SINGLE("Switch", TWL6040_REG_HFLCTL, 2, 1, 0);
static const struct snd_kcontrol_new hfl_mux_controls =
SOC_DAPM_ENUM("Route", twl6040_hf_enum[0]);

static const struct snd_kcontrol_new hfdacr_switch_controls =
SOC_DAPM_SINGLE("Switch", TWL6040_REG_HFRCTL, 2, 1, 0);
static const struct snd_kcontrol_new hfr_mux_controls =
SOC_DAPM_ENUM("Route", twl6040_hf_enum[1]);

static const struct snd_kcontrol_new ep_driver_switch_controls =
SOC_DAPM_SINGLE("Switch", TWL6040_REG_EARCTL, 0, 1, 0);
Expand All @@ -536,6 +564,10 @@ static const struct snd_kcontrol_new twl6040_snd_controls[] = {
SOC_DOUBLE_TLV("Capture Volume",
TWL6040_REG_MICGAIN, 0, 3, 4, 0, mic_amp_tlv),

/* AFM gains */
SOC_DOUBLE_TLV("Aux FM Volume",
TWL6040_REG_LINEGAIN, 0, 5, 0xF, 0, afm_amp_tlv),

/* Playback gains */
SOC_DOUBLE_TLV("Headset Playback Volume",
TWL6040_REG_HSGAIN, 0, 4, 0xF, 1, hs_tlv),
Expand Down Expand Up @@ -572,6 +604,12 @@ static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = {
SND_SOC_DAPM_PGA("MicAmpR",
TWL6040_REG_MICRCTL, 0, 0, NULL, 0),

/* Auxiliary FM PGAs */
SND_SOC_DAPM_PGA("AFMAmpL",
TWL6040_REG_MICLCTL, 1, 0, NULL, 0),
SND_SOC_DAPM_PGA("AFMAmpR",
TWL6040_REG_MICRCTL, 1, 0, NULL, 0),

/* ADCs */
SND_SOC_DAPM_ADC("ADC Left", "Left Front Capture",
TWL6040_REG_MICLCTL, 2, 0),
Expand Down Expand Up @@ -606,15 +644,15 @@ static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = {
twl6040_power_mode_event,
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),

/* Analog playback switches */
SND_SOC_DAPM_SWITCH("HSDAC Left Playback",
SND_SOC_NOPM, 0, 0, &hsdacl_switch_controls),
SND_SOC_DAPM_SWITCH("HSDAC Right Playback",
SND_SOC_NOPM, 0, 0, &hsdacr_switch_controls),
SND_SOC_DAPM_SWITCH("HFDAC Left Playback",
SND_SOC_NOPM, 0, 0, &hfdacl_switch_controls),
SND_SOC_DAPM_SWITCH("HFDAC Right Playback",
SND_SOC_NOPM, 0, 0, &hfdacr_switch_controls),
SND_SOC_DAPM_MUX("HF Left Playback",
SND_SOC_NOPM, 0, 0, &hfl_mux_controls),
SND_SOC_DAPM_MUX("HF Right Playback",
SND_SOC_NOPM, 0, 0, &hfr_mux_controls),
/* Analog playback Muxes */
SND_SOC_DAPM_MUX("HS Left Playback",
SND_SOC_NOPM, 0, 0, &hsl_mux_controls),
SND_SOC_DAPM_MUX("HS Right Playback",
SND_SOC_NOPM, 0, 0, &hsr_mux_controls),

/* Analog playback drivers */
SND_SOC_DAPM_PGA_E("Handsfree Left Driver",
Expand Down Expand Up @@ -658,12 +696,18 @@ static const struct snd_soc_dapm_route intercon[] = {
{"ADC Left", NULL, "MicAmpL"},
{"ADC Right", NULL, "MicAmpR"},

/* Headset playback path */
{"HSDAC Left Playback", "Switch", "HSDAC Left"},
{"HSDAC Right Playback", "Switch", "HSDAC Right"},
/* AFM path */
{"AFMAmpL", "NULL", "AFML"},
{"AFMAmpR", "NULL", "AFMR"},

{"HS Left Playback", "HS DAC", "HSDAC Left"},
{"HS Left Playback", "Line-In amp", "AFMAmpL"},

{"Headset Left Driver", NULL, "HSDAC Left Playback"},
{"Headset Right Driver", NULL, "HSDAC Right Playback"},
{"HS Right Playback", "HS DAC", "HSDAC Right"},
{"HS Right Playback", "Line-In amp", "AFMAmpR"},

{"Headset Left Driver", "NULL", "HS Left Playback"},
{"Headset Right Driver", "NULL", "HS Right Playback"},

{"HSOL", NULL, "Headset Left Driver"},
{"HSOR", NULL, "Headset Right Driver"},
Expand All @@ -672,12 +716,14 @@ static const struct snd_soc_dapm_route intercon[] = {
{"Earphone Driver", "Switch", "HSDAC Left"},
{"EP", NULL, "Earphone Driver"},

/* Handsfree playback path */
{"HFDAC Left Playback", "Switch", "HFDAC Left"},
{"HFDAC Right Playback", "Switch", "HFDAC Right"},
{"HF Left Playback", "HF DAC", "HFDAC Left"},
{"HF Left Playback", "Line-In amp", "AFMAmpL"},

{"HF Right Playback", "HF DAC", "HFDAC Right"},
{"HF Right Playback", "Line-In amp", "AFMAmpR"},

{"HFDAC Left PGA", NULL, "HFDAC Left Playback"},
{"HFDAC Right PGA", NULL, "HFDAC Right Playback"},
{"HFDAC Left PGA", NULL, "HF Left Playback"},
{"HFDAC Right PGA", NULL, "HF Right Playback"},

{"Handsfree Left Driver", "Switch", "HFDAC Left PGA"},
{"Handsfree Right Driver", "Switch", "HFDAC Right PGA"},
Expand Down

0 comments on commit 4679b7a

Please sign in to comment.