Merge branch 'v4.14-tacna' into v4.14-clsic

Change-Id: I71869f8d0b00bfd033cea6ead3ab0e45cb56798d
Signed-off-by: aford <[email protected]>

Author: afordcirrus

sound/soc/codecs/cs47l96-ao.c

@@ -601,7 +601,7 @@ static const struct snd_soc_dapm_route cs47l96_ao_dapm_routes[] = {
 
 static struct snd_soc_dai_driver cs47l96_ao_dai[] = {
 	{
-		.name = "cs47l96-ao-asp1",
+		.name = "cs47l96_ao-asp1",
 		.id = 1,
 		.base = TACNA_ASP1AO_ENABLES1,
 		.playback = {
@@ -623,7 +623,7 @@ static struct snd_soc_dai_driver cs47l96_ao_dai[] = {
 		.symmetric_samplebits = 1,
 	},
 	{
-		.name = "cs47l96-ao-cpu-trace",
+		.name = "cs47l96_ao-cpu-trace",
 		.capture = {
 			.stream_name = "Audio Trace CPU",
 			.channels_min = 1,
@@ -634,7 +634,7 @@ static struct snd_soc_dai_driver cs47l96_ao_dai[] = {
 		.compress_new = &snd_soc_new_compress,
 	},
 	{
-		.name = "cs47l96-ao-dsp-trace",
+		.name = "cs47l96_ao-dsp-trace",
 		.capture = {
 			.stream_name = "Audio Trace DSP",
 			.channels_min = 1,
@@ -644,7 +644,7 @@ static struct snd_soc_dai_driver cs47l96_ao_dai[] = {
 		},
 	},
 	{
-		.name = "cs47l96-ao-cpu-voicectrl",
+		.name = "cs47l96_ao-cpu-voicectrl",
 		.capture = {
 			.stream_name = "Voice Ctrl CPU",
 			.channels_min = 1,
@@ -655,7 +655,7 @@ static struct snd_soc_dai_driver cs47l96_ao_dai[] = {
 		.compress_new = &snd_soc_new_compress,
 	},
 	{
-		.name = "cs47l96-ao-dsp-voicectrl",
+		.name = "cs47l96_ao-dsp-voicectrl",
 		.capture = {
 			.stream_name = "Voice Ctrl DSP",
 			.channels_min = 1,
@@ -672,8 +672,8 @@ static int cs47l96_ao_compr_open(struct snd_compr_stream *stream)
 	struct cs47l96_ao *cs47l96_ao = snd_soc_platform_get_drvdata(rtd->platform);
 	struct tacna_priv *priv = &cs47l96_ao->core;
 
-	if (strcmp(rtd->codec_dai->name, "cs47l96-ao-dsp-trace") &&
-	    strcmp(rtd->codec_dai->name, "cs47l96-ao-dsp-voicectrl")) {
+	if (strcmp(rtd->codec_dai->name, "cs47l96_ao-dsp-trace") &&
+	    strcmp(rtd->codec_dai->name, "cs47l96_ao-dsp-voicectrl")) {
 		dev_err(priv->dev,
 			"No suitable compressed stream for DAI '%s'\n",
 			rtd->codec_dai->name);

sound/soc/codecs/cs47l96.c

@@ -894,6 +894,8 @@ SOC_ENUM_EXT("IN4L Rate", tacna_input_rate[6],
 SOC_ENUM_EXT("IN4R Rate", tacna_input_rate[7],
 	     snd_soc_get_enum_double, tacna_in_rate_put),
 
+TACNA_RATE_ENUM("Noise Generator Rate", noise_gen_rate),
+
 SOC_ENUM_EXT("OUTH Rate", cs47l96_outh_rate,
 	     snd_soc_get_enum_double, tacna_dac_rate_put),
 

sound/soc/codecs/cs48l32.c

@@ -568,6 +568,8 @@ SOC_ENUM_EXT("IN2L Rate", tacna_input_rate[2],
 SOC_ENUM_EXT("IN2R Rate", tacna_input_rate[3],
 	     snd_soc_get_enum_double, tacna_in_rate_put),
 
+TACNA_RATE_ENUM("Noise Generator Rate", noise_gen_rate),
+
 SOC_SINGLE_TLV("Noise Generator Volume", TACNA_COMFORT_NOISE_GENERATOR,
 	       TACNA_NOISE_GEN_GAIN_SHIFT, 0x12, 0, tacna_noise_tlv),
 

sound/soc/codecs/tacna.c

@@ -1080,6 +1080,15 @@ int tacna_low_power_mode_put(struct snd_kcontrol *kcontrol,
 }
 EXPORT_SYMBOL_GPL(tacna_low_power_mode_put);
 
+const struct soc_enum noise_gen_rate =
+	SOC_VALUE_ENUM_SINGLE(TACNA_COMFORT_NOISE_GENERATOR,
+			TACNA_NOISE_GEN_RATE_SHIFT,
+			TACNA_NOISE_GEN_RATE_MASK >> TACNA_NOISE_GEN_RATE_SHIFT,
+			TACNA_RATE_ENUM_SIZE,
+			tacna_rate_text,
+			tacna_rate_val);
+EXPORT_SYMBOL_GPL(noise_gen_rate);
+
 static const char * const tacna_auxpdm_freq_texts[] = {
 	"3.072MHz",
 	"2.048MHz",

sound/soc/codecs/tacna.h

@@ -462,6 +462,8 @@ extern const struct soc_enum tacna_input_rate[];
 int tacna_low_power_mode_put(struct snd_kcontrol *kcontrol,
 			     struct snd_ctl_elem_value *ucontrol);
 
+extern const struct soc_enum noise_gen_rate;
+
 extern const struct soc_enum tacna_auxpdm1_freq;
 extern const struct soc_enum tacna_auxpdm2_freq;
 extern const struct soc_enum tacna_auxpdm3_freq;