[Patch] TLV320AIC3X Driver Patch Code with MICBIAS


由於工作需求，因此需要針對 tlv320aic3x 的 driver 做 MICBIAS 的修改
（官方到了新版這部份還是沒改...）

然後在網路上找到了這份 Patch，趁著這個機會來記錄 & 說明一下：

這份 Patch 主要在新增 320AIC driver 內，提供 MICBIAS 的 voltage widget，
並且設定在 target board 內。這樣就可以有效的調整 MICBIAS 的值了！

完整 Patch Code 如下，有需要的就自行取用吧：




diff --git a/Documentation/devicetree/bindings/sound/tlv320aic3x.txt b/Documentation/devicetree/bindings/sound/tlv320aic3x.txt
index e7b98f4..f47c3f5 100644
--- a/Documentation/devicetree/bindings/sound/tlv320aic3x.txt
+++ b/Documentation/devicetree/bindings/sound/tlv320aic3x.txt
@@ -11,6 +11,12 @@ Optional properties:
 
 - gpio-reset - gpio pin number used for codec reset
 - ai3x-gpio-func - <array of 2 int> - AIC3X_GPIO1 & AIC3X_GPIO2 Functionality
+- ai3x-micbias-vg - MicBias Voltage required.
+ 1 - MICBIAS output is powered to 2.0V,
+ 2 - MICBIAS output is powered to 2.5V,
+ 3 - MICBIAS output is connected to AVDD,
+ If this node is not mentioned or if the value is incorrect, then MicBias
+ is powered down.
 
 Example:
 
diff --git a/include/sound/tlv320aic3x.h b/include/sound/tlv320aic3x.h
index ffd9bc7..9407fd0 100644
--- a/include/sound/tlv320aic3x.h
+++ b/include/sound/tlv320aic3x.h
@@ -46,6 +46,13 @@ enum {
  AIC3X_GPIO2_FUNC_BUTTON_PRESS_IRQ = 15
 };
 
+enum aic3x_micbias_voltage {
+ AIC3X_MICBIAS_OFF = 0,
+ AIC3X_MICBIAS_2_0V = 1,
+ AIC3X_MICBIAS_2_5V = 2,
+ AIC3X_MICBIAS_AVDDV = 3,
+};
+
 struct aic3x_setup_data {
  unsigned int gpio_func[2];
 };
@@ -53,6 +60,9 @@ struct aic3x_setup_data {
 struct aic3x_pdata {
  int gpio_reset; /* < 0 if not used */
  struct aic3x_setup_data *setup;
+
+ /* Selects the micbias voltage */
+ enum aic3x_micbias_voltage micbias_vg;
 };
 
 #endif
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 4989143..65d09d6 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -85,6 +85,9 @@ struct aic3x_priv {
 #define AIC3X_MODEL_33 1
 #define AIC3X_MODEL_3007 2
  u16 model;
+
+ /* Selects the micbias voltage */
+ enum aic3x_micbias_voltage micbias_vg;
 };
 
 /*
@@ -195,6 +198,37 @@ static int snd_soc_dapm_put_volsw_aic3x(struct snd_kcontrol *kcontrol,
  return ret;
 }
 
+/*
+ * mic bias power on/off share the same register bits with
+ * output voltage of mic bias. when power on mic bias, we
+ * need reclaim it to voltage value.
+ * 0x0 = Powered off
+ * 0x1 = MICBIAS output is powered to 2.0V,
+ * 0x2 = MICBIAS output is powered to 2.5V
+ * 0x3 = MICBIAS output is connected to AVDD
+ */
+static int mic_bias_event(struct snd_soc_dapm_widget *w,
+ struct snd_kcontrol *kcontrol, int event)
+{
+ struct snd_soc_codec *codec = w->codec;
+ struct aic3x_priv *aic3x = snd_soc_codec_get_drvdata(codec);
+
+ switch (event) {
+ case SND_SOC_DAPM_POST_PMU:
+  /* change mic bias voltage to user defined */
+  snd_soc_update_bits(codec, MICBIAS_CTRL,
+    MICBIAS_LEVEL_MASK,
+    aic3x->micbias_vg << MICBIAS_LEVEL_SHIFT);
+  break;
+
+ case SND_SOC_DAPM_PRE_PMD:
+  snd_soc_update_bits(codec, MICBIAS_CTRL,
+    MICBIAS_LEVEL_MASK, 0);
+  break;
+ }
+ return 0;
+}
+
 static const char *aic3x_left_dac_mux[] = { "DAC_L1", "DAC_L3", "DAC_L2" };
 static const char *aic3x_right_dac_mux[] = { "DAC_R1", "DAC_R3", "DAC_R2" };
 static const char *aic3x_left_hpcom_mux[] =
@@ -596,12 +630,9 @@ static const struct snd_soc_dapm_widget aic3x_dapm_widgets[] = {
     AIC3X_ASD_INTF_CTRLA, 0, 3, 3, 0),
 
  /* Mic Bias */
- SND_SOC_DAPM_REG(snd_soc_dapm_micbias, "Mic Bias 2V",
-    MICBIAS_CTRL, 6, 3, 1, 0),
- SND_SOC_DAPM_REG(snd_soc_dapm_micbias, "Mic Bias 2.5V",
-    MICBIAS_CTRL, 6, 3, 2, 0),
- SND_SOC_DAPM_REG(snd_soc_dapm_micbias, "Mic Bias AVDD",
-    MICBIAS_CTRL, 6, 3, 3, 0),
+ SND_SOC_DAPM_SUPPLY("Mic Bias", MICBIAS_CTRL, 6, 0,
+    mic_bias_event,
+    SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
 
  /* Output mixers */
  SND_SOC_DAPM_MIXER("Left Line Mixer", SND_SOC_NOPM, 0, 0,
@@ -1386,6 +1417,24 @@ static int aic3x_probe(struct snd_soc_codec *codec)
  if (aic3x->model == AIC3X_MODEL_3007)
   snd_soc_add_codec_controls(codec, &aic3x_classd_amp_gain_ctrl, 1);
 
+ /* set mic bias voltage */
+ switch (aic3x->micbias_vg) {
+ case AIC3X_MICBIAS_2_0V:
+ case AIC3X_MICBIAS_2_5V:
+ case AIC3X_MICBIAS_AVDDV:
+  snd_soc_update_bits(codec, MICBIAS_CTRL,
+        MICBIAS_LEVEL_MASK,
+        (aic3x->micbias_vg) << MICBIAS_LEVEL_SHIFT);
+  break;
+ case AIC3X_MICBIAS_OFF:
+  /*
+   * noting to do. target won't enter here. This is just to avoid
+   * compile time warning "warning: enumeration value
+   * 'AIC3X_MICBIAS_OFF' not handled in switch"
+   */
+  break;
+ }
+
  aic3x_add_widgets(codec);
  list_add(&aic3x->list, &reset_list);
 
@@ -1461,6 +1510,7 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,
  struct aic3x_setup_data *ai3x_setup;
  struct device_node *np = i2c->dev.of_node;
  int ret;
+ u32 value;
 
  aic3x = devm_kzalloc(&i2c->dev, sizeof(struct aic3x_priv), GFP_KERNEL);
  if (aic3x == NULL) {
@@ -1474,6 +1524,7 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,
  if (pdata) {
   aic3x->gpio_reset = pdata->gpio_reset;
   aic3x->setup = pdata->setup;
+  aic3x->micbias_vg = pdata->micbias_vg;
  } else if (np) {
   ai3x_setup = devm_kzalloc(&i2c->dev, sizeof(*ai3x_setup),
         GFP_KERNEL);
@@ -1493,6 +1544,26 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,
    aic3x->setup = ai3x_setup;
   }
 
+  if (!of_property_read_u32(np, "ai3x-micbias-vg", &value)) {
+   switch (value) {
+   case 1 :
+    aic3x->micbias_vg = AIC3X_MICBIAS_2_0V;
+    break;
+   case 2 :
+    aic3x->micbias_vg = AIC3X_MICBIAS_2_5V;
+    break;
+   case 3 :
+    aic3x->micbias_vg = AIC3X_MICBIAS_AVDDV;
+    break;
+   default :
+    aic3x->micbias_vg = AIC3X_MICBIAS_OFF;
+    dev_err(&i2c->dev, "Unsuitable MicBias voltage "
+       "found in DT\n");
+   }
+  } else {
+   aic3x->micbias_vg = AIC3X_MICBIAS_OFF;
+  }
+
  } else {
   aic3x->gpio_reset = -1;
  }
diff --git a/sound/soc/codecs/tlv320aic3x.h b/sound/soc/codecs/tlv320aic3x.h
index 6db3c41..e521ac3 100644
--- a/sound/soc/codecs/tlv320aic3x.h
+++ b/sound/soc/codecs/tlv320aic3x.h
@@ -238,6 +238,10 @@
 /* Default input volume */
 #define DEFAULT_GAIN    0x20
 
+/* MICBIAS Control Register */
+#define MICBIAS_LEVEL_SHIFT (6)
+#define MICBIAS_LEVEL_MASK (3 << 6)
+
 /* headset detection / button API */
 
 /* The AIC3x supports detection of stereo headsets (GND + left + right signal)
diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c
index d55e647..484b22c 100644
--- a/sound/soc/davinci/davinci-evm.c
+++ b/sound/soc/davinci/davinci-evm.c
@@ -116,9 +116,9 @@ static const struct snd_soc_dapm_route audio_map[] = {
  {"Line Out", NULL, "RLOUT"},
 
  /* Mic connected to (MIC3L | MIC3R) */
- {"MIC3L", NULL, "Mic Bias 2V"},
- {"MIC3R", NULL, "Mic Bias 2V"},
- {"Mic Bias 2V", NULL, "Mic Jack"},
+ {"MIC3L", NULL, "Mic Bias"},
+ {"MIC3R", NULL, "Mic Bias"},
+ {"Mic Bias", NULL, "Mic Jack"},
 
  /* Line In connected to (LINE1L | LINE2L), (LINE1R | LINE2R) */
  {"LINE1L", NULL, "Line In"},
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c
index 230b8c1..ee7cd53 100644
--- a/sound/soc/omap/n810.c
+++ b/sound/soc/omap/n810.c
@@ -230,8 +230,8 @@ static const struct snd_soc_dapm_route audio_map[] = {
  {"Ext Spk", NULL, "LLOUT"},
  {"Ext Spk", NULL, "RLOUT"},
 
- {"DMic Rate 64", NULL, "Mic Bias 2V"},
- {"Mic Bias 2V", NULL, "DMic"},
+ {"DMic Rate 64", NULL, "Mic Bias"},
+ {"Mic Bias", NULL, "DMic"},
 };
 
 static const char *spk_function[] = {"Off", "On"};
diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
index d921ddb..3cd5257 100644
--- a/sound/soc/omap/rx51.c
+++ b/sound/soc/omap/rx51.c
@@ -248,16 +248,16 @@ static const struct snd_soc_dapm_route audio_map[] = {
  {"FM Transmitter", NULL, "LLOUT"},
  {"FM Transmitter", NULL, "RLOUT"},
 
- {"DMic Rate 64", NULL, "Mic Bias 2V"},
- {"Mic Bias 2V", NULL, "DMic"},
+ {"DMic Rate 64", NULL, "Mic Bias"},
+ {"Mic Bias", NULL, "DMic"},
 };
 
 static const struct snd_soc_dapm_route audio_mapb[] = {
  {"b LINE2R", NULL, "MONO_LOUT"},
  {"Earphone", NULL, "b HPLOUT"},
 
- {"LINE1L", NULL, "b Mic Bias 2.5V"},
- {"b Mic Bias 2.5V", NULL, "HS Mic"}
+ {"LINE1L", NULL, "b Mic Bias"},
+ {"b Mic Bias", NULL, "HS Mic"}
 };
 
 static const char *spk_function[] = {"Off", "On"};
-- 
1.7.9.5

留言

張貼留言

這個網誌中的熱門文章

How to use ebtables: ebtable 的小筆記

這篇算是小筆記，主要在紀錄一些使用 ebtable 上的小問題： ebtable 主要分成三個 Main Table, 分別是 Filter, NAT 與 broute. 坊間有很多關於 ebtable 的資料，在這裡就不多說他是什麼東西了。 跟 iptable 一樣，ebtable 也有自己的 command 可以用，像是： 1. 分別列出 Filter, NAT, broute table. (我被這個搞好久...) ebtables -L ebtables -t nat -L ebtables -t broute -L 2. Create new chains: ebtables -t filter -N QOS ebtables -t nat -N MACFilter ebtables -t broute -N IGMP 3. Add new rules: ebtables -t filter -A FORWARD -j QOS ebtables -t nat -A PREROUTING -i eth0 -j MACFilter 其他像是 -D: delete rule, -F: Flush rule...等等，請參閱相關資料。 Download Package: http://ebtables.sourceforge.net/ Man page of ebtable: http://ebtables.sourceforge.net/misc/ebtables-man.html
閱讀完整內容

解決 VirtualBox 無法開啟 NS_ERROR_FAILURE (0x80004005)

在亂搞之後，我的 VirtualBox 也一度沒辦法開啟過，以下簡單紀錄下我的解決方法： 問題紀錄（當然 VM 名稱不是這個） [ root@localhost ~ ] # vboxmanage startvm <vmname> Waiting for VM "<vmname>" to power on... VBoxManage: error: The virtual machine '<vmname>' has terminated unexpectedly during startup with exit code 0 VBoxManage: error: Details: code NS_ERROR_FAILURE ( 0x80004005 ) , component Machine, interface IMachine, callee 參考了網路上的解法之後，大概是這樣： 1. 需要重新去掛載 VirtualBox 的 module: /etc/init.d/vboxdrv setup 2. 在 console 下重新執行一次 VM ，看看能不能動 vboxmanage startvm <vmname> 3. 再利用 console 把 vm 關掉，並重新開機 VBoxManage controlvm <vmname> poweroff 4. 然後再開就不會發生問題了。 網路上的偏方與解法還不少，有的人建議要把 ~/.VirtualBox 底下的 .xml 檔刪除掉，可是這樣一來會造成 之前建立好的 VM 會消失不見（除非你剛灌好，不然就...） 參考看看吧～ PS. 絕對不可以手殘亂去刪除 SnapShot 資料夾底下的資料，不然... 參考資料： http://blog.csdn.net/t0nsha/article/details/7482986 http://forum.ubuntu.org.cn/viewtopic.php?f=65&t=204736 http://passover.blog.51cto.com/2431658/73
閱讀完整內容