ASoC: tacna: Add a rate control for Sample Rate 1

Also make use of the macros available for defining rate controls.

Change-Id: I1a1b4f44bfd77f025e23e8191d0b5b6f529548f4
Signed-off-by: Stuart Henderson <[email protected]>

Author: stuhenderson

sound/soc/codecs/cs47l96.c

@@ -781,10 +781,11 @@ SND_SOC_BYTES("ANCL Config", TACNA_ANC_L_CTRL_1, 1),
 SND_SOC_BYTES("ANCL Coefficients", TACNA_ANC_L_CTRL_3,
 	      (TACNA_ANC_L_CTRL_66 - TACNA_ANC_L_CTRL_3) / 4 + 1),
 
-SOC_ENUM("Sample Rate 2", tacna_sample_rate[0]),
-SOC_ENUM("Sample Rate 3", tacna_sample_rate[1]),
-SOC_ENUM("Async Sample Rate 1", tacna_sample_rate_async[0]),
-SOC_ENUM("Async Sample Rate 2", tacna_sample_rate_async[1]),
+TACNA_RATE_CONTROL("Sample Rate 1", 1),
+TACNA_RATE_CONTROL("Sample Rate 2", 2),
+TACNA_RATE_CONTROL("Sample Rate 3", 3),
+TACNA_ASYNC_RATE_CONTROL("Async Sample Rate 1", 1),
+TACNA_ASYNC_RATE_CONTROL("Async Sample Rate 2", 2),
 
 TACNA_RATE_ENUM("FX Rate", tacna_fx_rate),
 

sound/soc/codecs/cs48l32.c

@@ -544,9 +544,10 @@ SOC_ENUM("LHPF2 Mode", tacna_lhpf2_mode),
 SOC_ENUM("LHPF3 Mode", tacna_lhpf3_mode),
 SOC_ENUM("LHPF4 Mode", tacna_lhpf4_mode),
 
-SOC_ENUM("Sample Rate 2", tacna_sample_rate[0]),
-SOC_ENUM("Sample Rate 3", tacna_sample_rate[1]),
-SOC_ENUM("Sample Rate 4", tacna_sample_rate[2]),
+TACNA_RATE_CONTROL("Sample Rate 1", 1),
+TACNA_RATE_CONTROL("Sample Rate 2", 2),
+TACNA_RATE_CONTROL("Sample Rate 3", 3),
+TACNA_RATE_CONTROL("Sample Rate 4", 4),
 
 TACNA_RATE_ENUM("FX Rate", tacna_fx_rate),
 

sound/soc/codecs/tacna.c

@@ -548,6 +548,13 @@ const char *tacna_sample_rate_val_to_name(unsigned int rate_val)
 EXPORT_SYMBOL_GPL(tacna_sample_rate_val_to_name);
 
 const struct soc_enum tacna_sample_rate[] = {
+	SOC_VALUE_ENUM_SINGLE(TACNA_SAMPLE_RATE1,
+			      TACNA_SAMPLE_RATE_1_SHIFT,
+			      TACNA_SAMPLE_RATE_1_MASK >>
+			      TACNA_SAMPLE_RATE_1_SHIFT,
+			      TACNA_SAMPLE_RATE_ENUM_SIZE,
+			      tacna_sample_rate_text,
+			      tacna_sample_rate_val),
 	SOC_VALUE_ENUM_SINGLE(TACNA_SAMPLE_RATE2,
 			      TACNA_SAMPLE_RATE_2_SHIFT,
 			      TACNA_SAMPLE_RATE_2_MASK >>

sound/soc/codecs/tacna.h

@@ -220,8 +220,11 @@
 	TACNA_MIXER_ROUTES(name, name "RX11"),		\
 	TACNA_MIXER_ROUTES(name, name "RX12")		\
 
-#define TACNA_SAMPLE_RATE_CONTROL(name, domain) \
-	SOC_ENUM(name, tacna_sample_rate[(domain) - 2])
+#define TACNA_RATE_CONTROL(name, domain) \
+	SOC_ENUM(name, tacna_sample_rate[(domain) - 1])
+
+#define TACNA_ASYNC_RATE_CONTROL(name, domain) \
+	SOC_ENUM(name, tacna_sample_rate_async[(domain) - 1])
 
 #define TACNA_RATE_ENUM(name, enum) \
 	SOC_ENUM_EXT(name, enum, snd_soc_get_enum_double, tacna_rate_put)