diff options
author | Lopez Cruz, Misael <x0052729@ti.com> | 2009-06-22 11:51:52 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-06-23 05:57:37 -0400 |
commit | 328d0a138e3d7761f4db53fabf82279b90ea66dd (patch) | |
tree | ce2cf185c99043253d441238bfc71a5cf5e00206 /sound/soc | |
parent | c264301c777840b2df130e042b7f5a0c1041646f (diff) |
ASoC: TWL4030: Add AVADC Clock Priority
AVDAC clk priority allows to determine the path ADC must
be connected when the codec is in option2 and both HiFi
and Voice paths are enabled.
Signed-off-by: Misael Lopez Cruz <x0052729@ti.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/codecs/twl4030.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 091125c888ed..f916a9a46712 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c | |||
@@ -1005,6 +1005,16 @@ static DECLARE_TLV_DB_SCALE(digital_capture_tlv, 0, 100, 0); | |||
1005 | */ | 1005 | */ |
1006 | static DECLARE_TLV_DB_SCALE(input_gain_tlv, 0, 600, 0); | 1006 | static DECLARE_TLV_DB_SCALE(input_gain_tlv, 0, 600, 0); |
1007 | 1007 | ||
1008 | /* AVADC clock priority */ | ||
1009 | static const char *twl4030_avadc_clk_priority_texts[] = { | ||
1010 | "Voice high priority", "HiFi high priority" | ||
1011 | }; | ||
1012 | |||
1013 | static const struct soc_enum twl4030_avadc_clk_priority_enum = | ||
1014 | SOC_ENUM_SINGLE(TWL4030_REG_AVADC_CTL, 2, | ||
1015 | ARRAY_SIZE(twl4030_avadc_clk_priority_texts), | ||
1016 | twl4030_avadc_clk_priority_texts); | ||
1017 | |||
1008 | static const char *twl4030_rampdelay_texts[] = { | 1018 | static const char *twl4030_rampdelay_texts[] = { |
1009 | "27/20/14 ms", "55/40/27 ms", "109/81/55 ms", "218/161/109 ms", | 1019 | "27/20/14 ms", "55/40/27 ms", "109/81/55 ms", "218/161/109 ms", |
1010 | "437/323/218 ms", "874/645/437 ms", "1748/1291/874 ms", | 1020 | "437/323/218 ms", "874/645/437 ms", "1748/1291/874 ms", |
@@ -1106,6 +1116,8 @@ static const struct snd_kcontrol_new twl4030_snd_controls[] = { | |||
1106 | SOC_DOUBLE_TLV("Analog Capture Volume", TWL4030_REG_ANAMIC_GAIN, | 1116 | SOC_DOUBLE_TLV("Analog Capture Volume", TWL4030_REG_ANAMIC_GAIN, |
1107 | 0, 3, 5, 0, input_gain_tlv), | 1117 | 0, 3, 5, 0, input_gain_tlv), |
1108 | 1118 | ||
1119 | SOC_ENUM("AVADC Clock Priority", twl4030_avadc_clk_priority_enum), | ||
1120 | |||
1109 | SOC_ENUM("HS ramp delay", twl4030_rampdelay_enum), | 1121 | SOC_ENUM("HS ramp delay", twl4030_rampdelay_enum), |
1110 | 1122 | ||
1111 | SOC_ENUM("Vibra H-bridge mode", twl4030_vibradirmode_enum), | 1123 | SOC_ENUM("Vibra H-bridge mode", twl4030_vibradirmode_enum), |