[PATCH 2/3] ASoC: TWL4030: Add AVADC Clock Priority

[PATCH 2/3] ASoC: TWL4030: Add AVADC Clock Priority

[Lopez Cruz, Misael]

AVDAC clk priority allows to determine the path ADC must
be connected when the codec is in option2 and both audio
and voice paths are enabled.

Signed-off-by: Misael Lopez Cruz <x0052729@ti.com>
---
 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 780217a..fd5b30f 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -1036,6 +1036,16 @@ static DECLARE_TLV_DB_SCALE(digital_capture_tlv, 0, 100, 0);
  */
 static DECLARE_TLV_DB_SCALE(input_gain_tlv, 0, 600, 0);
 
+/* AVADC clock priority */
+static const char *twl4030_avadc_clk_priority_texts[] = {
+	"Voice high priority", "Audio high priority"
+};
+
+static const struct soc_enum twl4030_avadc_clk_priority_enum =
+	SOC_ENUM_SINGLE(TWL4030_REG_AVADC_CTL, 2,
+			ARRAY_SIZE(twl4030_avadc_clk_priority_texts),
+			twl4030_avadc_clk_priority_texts);
+
 static const char *twl4030_rampdelay_texts[] = {
 	"27/20/14 ms", "55/40/27 ms", "109/81/55 ms", "218/161/109 ms",
 	"437/323/218 ms", "874/645/437 ms", "1748/1291/874 ms",
@@ -1137,6 +1147,8 @@ static const struct snd_kcontrol_new twl4030_snd_controls[] = {
 	SOC_DOUBLE_TLV("Analog Capture Volume", TWL4030_REG_ANAMIC_GAIN,
 		0, 3, 5, 0, input_gain_tlv),
 
+	SOC_ENUM("AVADC Clock Priority", twl4030_avadc_clk_priority_enum),
+
 	SOC_ENUM("HS ramp delay", twl4030_rampdelay_enum),
 
 	SOC_ENUM("Vibra H-bridge mode", twl4030_vibradirmode_enum),
-- 
1.5.4.3

Re: [PATCH 2/3] ASoC: TWL4030: Add AVADC Clock Priority

[Mark Brown]

On Fri, Jun 19, 2009 at 03:23:42AM -0500, Lopez Cruz, Misael wrote:

> +/* AVADC clock priority */
> +static const char *twl4030_avadc_clk_priority_texts[] = {
> +	"Voice high priority", "Audio high priority"
> +};
> +

It'd probably be better to say "Hifi" (or whatever spelling the rest of
the driver uses) rather than "Audio" here.  Audio is a bit confusing
since obviously the voice data is audio data too, it's just a different
path through the CODEC with different characteristics.  The same thing
has been done elsewhere in the driver.

Re: [PATCH 2/3] ASoC: TWL4030: Add AVADC Clock Priority

[Lopez Cruz, Misael]

> > +/* AVADC clock priority */
> > +static const char *twl4030_avadc_clk_priority_texts[] = {
> > +	"Voice high priority", "Audio high priority"
> > +};
> > +

> It'd probably be better to say "Hifi" (or whatever spelling 
> the rest of the driver uses) rather than "Audio" here.  Audio 
> is a bit confusing since obviously the voice data is audio 
> data too, it's just a different path through the CODEC with 
> different characteristics.  The same thing has been done 
> elsewhere in the driver.

Agree, "HiFi" is being used in codec DAI definition so I'll
use that too.

I'll wait for Peter's comments before resending the patch.

Thanks,
Misa

Re: [PATCH 2/3] ASoC: TWL4030: Add AVADC Clock Priority

[Peter Ujfalusi]

On Friday 19 June 2009 20:57:39 ext Lopez Cruz, Misael wrote:
> > > +/* AVADC clock priority */
> > > +static const char *twl4030_avadc_clk_priority_texts[] = {
> > > +	"Voice high priority", "Audio high priority"
> > > +};
> > > +
> >
> > It'd probably be better to say "Hifi" (or whatever spelling
> > the rest of the driver uses) rather than "Audio" here.  Audio
> > is a bit confusing since obviously the voice data is audio
> > data too, it's just a different path through the CODEC with
> > different characteristics.  The same thing has been done
> > elsewhere in the driver.
>
> Agree, "HiFi" is being used in codec DAI definition so I'll
> use that too.
>
> I'll wait for Peter's comments before resending the patch.

Please change the Audio to HiFi, otherwise it is OK.

>
> Thanks,
> Misa

-- 
Péter