Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge remote-tracking branch 'asoc/fix/da7213' into asoc-linus

Mark Brown 12 years ago
parent
f722406faa 61559af111
commit
0335cd6c4f
1 changed files with 4 additions and 4 deletions
Split View Show Diff Stats
  1. 4 4
      sound/soc/codecs/da7213.c

+ 4 - 4
sound/soc/codecs/da7213.c
View File 

@@ -1488,17 +1488,17 @@ static int da7213_probe(struct snd_soc_codec *codec)
 
 				     DA7213_DMIC_DATA_SEL_SHIFT);
 
 			break;
 
 		}
 
-		switch (pdata->dmic_data_sel) {
 
+		switch (pdata->dmic_samplephase) {
 
 		case DA7213_DMIC_SAMPLE_ON_CLKEDGE:
 
 		case DA7213_DMIC_SAMPLE_BETWEEN_CLKEDGE:
 
-			dmic_cfg |= (pdata->dmic_data_sel <<
 
+			dmic_cfg |= (pdata->dmic_samplephase <<
 
 				     DA7213_DMIC_SAMPLEPHASE_SHIFT);
 
 			break;
 
 		}
 
-		switch (pdata->dmic_data_sel) {
 
+		switch (pdata->dmic_clk_rate) {
 
 		case DA7213_DMIC_CLK_3_0MHZ:
 
 		case DA7213_DMIC_CLK_1_5MHZ:
 
-			dmic_cfg |= (pdata->dmic_data_sel <<
 
+			dmic_cfg |= (pdata->dmic_clk_rate <<
 
 				     DA7213_DMIC_CLK_RATE_SHIFT);
 
 			break;
 
 		}