update wm8960 driver

sound/soc/codecs/wm8960.c

@@ -405,6 +405,7 @@ SND_SOC_DAPM_PGA("OUT3 VMID", WM8960_POWER2, 1, 0, NULL, 0),
 };
 
 static const struct snd_soc_dapm_route audio_paths[] = {
+	{ "Left Boost Mixer", NULL , "MICB"},
 	{ "Left Boost Mixer", "LINPUT1 Switch", "LINPUT1" },
 	{ "Left Boost Mixer", "LINPUT2 Switch", "LINPUT2" },
 	{ "Left Boost Mixer", "LINPUT3 Switch", "LINPUT3" },
@@ -414,6 +415,7 @@ static const struct snd_soc_dapm_route audio_paths[] = {
 	{ "Left Input Mixer", NULL, "LINPUT2" },
 	{ "Left Input Mixer", NULL, "LINPUT3" },
 
+	{ "Right Boost Mixer", NULL , "MICB"},
 	{ "Right Boost Mixer", "RINPUT1 Switch", "RINPUT1" },
 	{ "Right Boost Mixer", "RINPUT2 Switch", "RINPUT2" },
 	{ "Right Boost Mixer", "RINPUT3 Switch", "RINPUT3" },
@@ -601,161 +603,155 @@ static const int bclk_divs[] = {
 	120, 160, 220, 240, 320, 320, 320
 };
 
-/**
+   
- * wm8960_configure_sysclk - checks if there is a sysclk frequency available
+																			
- *	The sysclk must be chosen such that:
+									   
- *		- sysclk     = MCLK / sysclk_divs
+									 
- *		- lrclk      = sysclk / dac_divs
+									
- *		- 10 * bclk  = sysclk / bclk_divs
+									 
- *
+  
- *	If we cannot find an exact match for (sysclk, lrclk, bclk)
+															 
- *	triplet, we relax the bclk such that bclk is chosen as the
+															 
- *	closest available frequency greater than expected bclk.
+														  
- *
+  
- * @wm8960_priv: wm8960 codec private data
+										  
- * @mclk: MCLK used to derive sysclk
+									
- * @sysclk_idx: sysclk_divs index for found sysclk
+												  
- * @dac_idx: dac_divs index for found lrclk
+										   
- * @bclk_idx: bclk_divs index for found bclk
+											
- *
+  
- * Returns:
+		   
- *  -1, in case no sysclk frequency available found
+												   
- * >=0, in case we could derive bclk and lrclk from sysclk using
+																
- *      (@sysclk_idx, @dac_idx, @bclk_idx) dividers
+												   
- */
+   
-static
+	  
-int wm8960_configure_sysclk(struct wm8960_priv *wm8960, int mclk,
+																 
-			    int *sysclk_idx, int *dac_idx, int *bclk_idx)
+													
-{
+ 
-	int sysclk, bclk, lrclk;
+						 
-	int i, j, k;
+			 
-	int diff, closest = mclk;
+						  
 
-	/* marker for no match */
+						  
-	*bclk_idx = -1;
+				
 
-	bclk = wm8960->bclk;
+					 
-	lrclk = wm8960->lrclk;
+					   
 
-	/* check if the sysclk frequency is available. */
+												  
-	for (i = 0; i < ARRAY_SIZE(sysclk_divs); ++i) {
+												
-		if (sysclk_divs[i] == -1)
+						   
-			continue;
+			
-		sysclk = mclk / sysclk_divs[i];
+								 
-		for (j = 0; j < ARRAY_SIZE(dac_divs); ++j) {
+											  
-			if (sysclk != dac_divs[j] * lrclk)
+									 
-				continue;
+			 
-			for (k = 0; k < ARRAY_SIZE(bclk_divs); ++k) {
+												
-				diff = sysclk - bclk * bclk_divs[k] / 10;
+											 
-				if (diff == 0) {
+					
-					*sysclk_idx = i;
+					 
-					*dac_idx = j;
+				  
-					*bclk_idx = k;
+				   
-					break;
+		   
-				}
+	 
-				if (diff > 0 && closest > diff) {
+									 
-					*sysclk_idx = i;
+					 
-					*dac_idx = j;
+				  
-					*bclk_idx = k;
+				   
-					closest = diff;
+					
-				}
+	 
-			}
+	
-			if (k != ARRAY_SIZE(bclk_divs))
+								  
-				break;
+		  
-		}
+   
-		if (j != ARRAY_SIZE(dac_divs))
+								
-			break;
+		 
-	}
+  
-	return *bclk_idx;
+				  
-}
+ 
 
-/**
+   
- * wm8960_configure_pll - checks if there is a PLL out frequency available
+																		  
- *	The PLL out frequency must be chosen such that:
+												  
- *		- sysclk      = lrclk * dac_divs
+									
- *		- freq_out    = sysclk * sysclk_divs
+										
- *		- 10 * sysclk = bclk * bclk_divs
+									
- *
+  
- * 	If we cannot find an exact match for (sysclk, lrclk, bclk)
+															  
- * 	triplet, we relax the bclk such that bclk is chosen as the
+															  
- * 	closest available frequency greater than expected bclk.
+														   
- *
+  
- * @component: component structure
+								  
- * @freq_in: input frequency used to derive freq out via PLL
+															
- * @sysclk_idx: sysclk_divs index for found sysclk
+												  
- * @dac_idx: dac_divs index for found lrclk
+										   
- * @bclk_idx: bclk_divs index for found bclk
+											
- *
+  
- * Returns:
+		   
- * < 0, in case no PLL frequency out available was found
+														
- * >=0, in case we could derive bclk, lrclk, sysclk from PLL out using
+																	  
- *      (@sysclk_idx, @dac_idx, @bclk_idx) dividers
+												   
- */
+   
-static
+	  
-int wm8960_configure_pll(struct snd_soc_component *component, int freq_in,
+																		  
-			 int *sysclk_idx, int *dac_idx, int *bclk_idx)
+												 
-{
+ 
-	struct wm8960_priv *wm8960 = snd_soc_component_get_drvdata(component);
+																	   
-	int sysclk, bclk, lrclk, freq_out;
+								   
-	int diff, closest, best_freq_out;
+								  
-	int i, j, k;
+			 
 
-	bclk = wm8960->bclk;
+					 
-	lrclk = wm8960->lrclk;
+					   
-	closest = freq_in;
+				   
 
-	best_freq_out = -EINVAL;
+						 
-	*sysclk_idx = *dac_idx = *bclk_idx = -1;
+										 
 
-	/*
+												
-	 * From Datasheet, the PLL performs best when f2 is between
+						   
-	 * 90MHz and 100MHz, the desired sysclk output is 11.2896MHz
+			
-	 * or 12.288MHz, then sysclkdiv = 2 is the best choice.
+											  
-	 * So search sysclk_divs from 2 to 1 other than from 1 to 2.
+								
-	 */
+									  
-	for (i = ARRAY_SIZE(sysclk_divs) - 1; i >= 0; --i) {
-		if (sysclk_divs[i] == -1)
-			continue;
-		for (j = 0; j < ARRAY_SIZE(dac_divs); ++j) {
-			sysclk = lrclk * dac_divs[j];
-			freq_out = sysclk * sysclk_divs[i];
 
-			for (k = 0; k < ARRAY_SIZE(bclk_divs); ++k) {
+												
-				if (!is_pll_freq_available(freq_in, freq_out))
+												  
-					continue;
+			  
 
-				diff = sysclk - bclk * bclk_divs[k] / 10;
+											 
-				if (diff == 0) {
+					
-					*sysclk_idx = i;
+					 
-					*dac_idx = j;
+				  
-					*bclk_idx = k;
+				   
-					return freq_out;
+					 
-				}
+	 
-				if (diff > 0 && closest > diff) {
+									 
-					*sysclk_idx = i;
+					 
-					*dac_idx = j;
+				  
-					*bclk_idx = k;
+				   
-					closest = diff;
+					
-					best_freq_out = freq_out;
+							  
-				}
+	 
-			}
+	
-		}
+   
-	}
+  
 
-	return best_freq_out;
+					  
-}
+ 
 static int wm8960_configure_clocking(struct snd_soc_component *component)
 {
 	struct wm8960_priv *wm8960 = snd_soc_component_get_drvdata(component);
-	int freq_out, freq_in;
+	int sysclk, bclk, lrclk, freq_out, freq_in;
 	u16 iface1 = snd_soc_component_read32(component, WM8960_IFACE1);
 	int i, j, k;
-	int ret;
+		 
 
 	if (!(iface1 & (1<<6))) {
 		dev_dbg(component->dev,
 			"Codec is slave mode, no need to configure clock\n");
-		return 0;
+		//return 0;
 	}
 
 	if (wm8960->clk_id != WM8960_SYSCLK_MCLK && !wm8960->freq_in) {
@@ -764,6 +760,11 @@ static int wm8960_configure_clocking(struct snd_soc_component *component)
 	}
 
 	freq_in = wm8960->freq_in;
+	bclk = wm8960->bclk;
+	lrclk = wm8960->lrclk;
+
+	//printk("clk_id %d freq_in: %d bclk: %d  lrclk: %d\n",wm8960->clk_id ,freq_in, bclk,lrclk);
+
 	/*
 	 * If it's sysclk auto mode, check if the MCLK can provide sysclk or
 	 * not. If MCLK can provide sysclk, using MCLK to provide sysclk
@@ -782,21 +783,61 @@ static int wm8960_configure_clocking(struct snd_soc_component *component)
 	}
 
 	if (wm8960->clk_id != WM8960_SYSCLK_PLL) {
-		ret = wm8960_configure_sysclk(wm8960, freq_out, &i, &j, &k);
+		/* check if the sysclk frequency is available. */
-		if (ret >= 0) {
+		for (i = 0; i < ARRAY_SIZE(sysclk_divs); ++i) {
+			if (sysclk_divs[i] == -1)
+				continue;
+			sysclk = freq_out / sysclk_divs[i];
+			for (j = 0; j < ARRAY_SIZE(dac_divs); ++j) {
+				if (sysclk != dac_divs[j] * lrclk)
+					continue;
+				for (k = 0; k < ARRAY_SIZE(bclk_divs); ++k)
+					if (sysclk == bclk * bclk_divs[k] / 10)
+						break;
+				if (k != ARRAY_SIZE(bclk_divs))
+					break;
+			}
+			if (j != ARRAY_SIZE(dac_divs))
+				break;
+		}
+
+		if (i != ARRAY_SIZE(sysclk_divs)) {
 			goto configure_clock;
 		} else if (wm8960->clk_id != WM8960_SYSCLK_AUTO) {
 			dev_err(component->dev, "failed to configure clock\n");
 			return -EINVAL;
 		}
 	}
+	/* get a available pll out frequency and set pll */
+	for (i = 0; i < ARRAY_SIZE(sysclk_divs); ++i) {
+		if (sysclk_divs[i] == -1)
+			continue;
+		for (j = 0; j < ARRAY_SIZE(dac_divs); ++j) {
+			sysclk = lrclk * dac_divs[j];
+			freq_out = sysclk * sysclk_divs[i];
 
-	freq_out = wm8960_configure_pll(component, freq_in, &i, &j, &k);
+			for (k = 0; k < ARRAY_SIZE(bclk_divs); ++k) {
-	if (freq_out < 0) {
+				if (sysclk == bclk * bclk_divs[k] / 10 &&
-		dev_err(component->dev, "failed to configure clock via PLL\n");
+				    is_pll_freq_available(freq_in, freq_out)) {
-		return freq_out;
+					wm8960_set_pll(component,
+						       freq_in, freq_out);
+					break;
+				} else {
+					continue;
+				}
+			}
+			if (k != ARRAY_SIZE(bclk_divs))
+				break;
+		}
+		if (j != ARRAY_SIZE(dac_divs))
+			break;
 	}
-	wm8960_set_pll(component, freq_in, freq_out);
+
+	if (i == ARRAY_SIZE(sysclk_divs)) {
+		dev_err(component->dev, "failed to configure clock\n");
+		return -EINVAL;
+	}
+											  
 
 configure_clock:
 	/* configure sysclk clock */
@@ -842,7 +883,7 @@ static int wm8960_hw_params(struct snd_pcm_substream *substream,
 			iface |= 0x000c;
 			break;
 		}
-		/* fall through */
+		fallthrough;
 	default:
 		dev_err(component->dev, "unsupported width %d\n",
 			params_width(params));
@@ -884,7 +925,7 @@ static int wm8960_hw_free(struct snd_pcm_substream *substream,
 	return 0;
 }
 
-static int wm8960_mute(struct snd_soc_dai *dai, int mute)
+static int wm8960_mute(struct snd_soc_dai *dai, int mute, int direction)
 {
 	struct snd_soc_component *component = dai->component;
 
@@ -1290,6 +1331,7 @@ static int wm8960_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
 {
 	struct snd_soc_component *component = dai->component;
 	struct wm8960_priv *wm8960 = snd_soc_component_get_drvdata(component);
+	clk_id = WM8960_SYSCLK_PLL;
 
 	switch (clk_id) {
 	case WM8960_SYSCLK_MCLK:
@@ -1306,6 +1348,7 @@ static int wm8960_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
 		return -EINVAL;
 	}
 
+	wm8960->freq_in = 24000000;
 	wm8960->sysclk = freq;
 	wm8960->clk_id = clk_id;
 
@@ -1321,7 +1364,7 @@ static int wm8960_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
 static const struct snd_soc_dai_ops wm8960_dai_ops = {
 	.hw_params = wm8960_hw_params,
 	.hw_free = wm8960_hw_free,
-	.digital_mute = wm8960_mute,
+	.mute_stream = wm8960_mute,
 	.set_fmt = wm8960_set_dai_fmt,
 	.set_clkdiv = wm8960_set_dai_clkdiv,
 	.set_pll = wm8960_set_dai_pll,
@@ -1370,7 +1413,6 @@ static const struct snd_soc_component_driver soc_component_dev_wm8960 = {
 	.idle_bias_on		= 1,
 	.use_pmdown_time	= 1,
 	.endianness		= 1,
-	.non_legacy_dai_naming	= 1,
 };
 
 static const struct regmap_config wm8960_regmap = {
@@ -1410,18 +1452,11 @@ static int wm8960_i2c_probe(struct i2c_client *i2c,
 	if (wm8960 == NULL)
 		return -ENOMEM;
 
+	wm8960->clk_id = WM8960_SYSCLK_PLL;
 	wm8960->mclk = devm_clk_get(&i2c->dev, "mclk");
 	if (IS_ERR(wm8960->mclk)) {
 		if (PTR_ERR(wm8960->mclk) == -EPROBE_DEFER)
 			return -EPROBE_DEFER;
-	} else {
-		ret = clk_get_rate(wm8960->mclk);
-		if (ret >= 0) {
-			wm8960->freq_in = ret;
-		} else {
-			dev_err(&i2c->dev, "Failed to read MCLK rate: %d\n",
-				ret);
-		}
 	}
 
 	wm8960->regmap = devm_regmap_init_i2c(i2c, &wm8960_regmap);

sound/soc/codecs/wm8960.h

@@ -1,6 +1,9 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * wm8960.h  --  WM8960 Soc Audio driver
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  */
 
 #ifndef _WM8960_H

sound/soc/sunxi_v2/snd_sunxi_ahub.c

@@ -39,7 +39,7 @@ static int sunxi_ahub_dai_startup(struct snd_pcm_substream *substream,
 	struct regmap *regmap = NULL;
 	unsigned int apb_num, tdm_num;
 
-	SND_LOG_DEBUG(HLOG, "\n");
+	pr_err("BPI, %s\n", __func__);
 
 	regmap = ahub_info->mem_info.regmap;
 	apb_num = ahub_info->dts_info.apb_num;
@@ -938,7 +938,7 @@ static void sunxi_ahub_dai_shutdown(struct snd_pcm_substream *substream,
 	struct regmap *regmap = NULL;
 	unsigned int apb_num, tdm_num;
 
-	SND_LOG_DEBUG(HLOG, "\n");
+	pr_err("BPI, %s\n", __func__);
 
 	regmap = ahub_info->mem_info.regmap;
 	apb_num = ahub_info->dts_info.apb_num;
@@ -1698,4 +1698,4 @@ module_exit(sunxi_ahub_dev_exit);
 
 MODULE_AUTHOR("Dby@allwinnertech.com");
 MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("sunxi soundcard platform of ahub");
+MODULE_DESCRIPTION("sunxi soundcard platform of ahub");