Skip to content

cloud-kernel
cloud-kernel

openanolis / cloud-kernel
接近 2 年 前同步成功

通知 170
Star 36
Fork 7
cloud-kernel
cloud-kernel
提交 44008559 编写于 作者: M Mark Brown
浏览文件
操作

Merge branch 'for-3.0' into for-3.1

上级 b0b3e6f8 b793eb60
隐藏空白更改
内联 并排
Showing with 4 addition and 3 deletion
sound/soc/codecs/wm8994.c
浏览文件 @ 44008559
...@@ -1206,7 +1206,6 @@ SND_SOC_DAPM_INPUT("DMIC1DAT"), ...@@ -1206,7 +1206,6 @@ SND_SOC_DAPM_INPUT("DMIC1DAT"),
SND_SOC_DAPM_INPUT("DMIC2DAT"), SND_SOC_DAPM_INPUT("DMIC2DAT"),
SND_SOC_DAPM_INPUT("Clock"), SND_SOC_DAPM_INPUT("Clock"),
SND_SOC_DAPM_MICBIAS("MICBIAS", WM8994_MICBIAS, 2, 0),
SND_SOC_DAPM_SUPPLY_S("MICBIAS Supply", 1, SND_SOC_NOPM, 0, 0, micbias_ev, SND_SOC_DAPM_SUPPLY_S("MICBIAS Supply", 1, SND_SOC_NOPM, 0, 0, micbias_ev,
SND_SOC_DAPM_PRE_PMU), SND_SOC_DAPM_PRE_PMU),
...@@ -1517,8 +1516,10 @@ static const struct snd_soc_dapm_route wm8994_revd_intercon[] = { ...@@ -1517,8 +1516,10 @@ static const struct snd_soc_dapm_route wm8994_revd_intercon[] = {
{ "AIF2DACDAT", NULL, "AIF1DACDAT" }, { "AIF2DACDAT", NULL, "AIF1DACDAT" },
{ "AIF1ADCDAT", NULL, "AIF2ADCDAT" }, { "AIF1ADCDAT", NULL, "AIF2ADCDAT" },
{ "AIF2ADCDAT", NULL, "AIF1ADCDAT" }, { "AIF2ADCDAT", NULL, "AIF1ADCDAT" },
{ "MICBIAS", NULL, "CLK_SYS" }, { "MICBIAS1", NULL, "CLK_SYS" },
{ "MICBIAS", NULL, "MICBIAS Supply" }, { "MICBIAS1", NULL, "MICBIAS Supply" },
{ "MICBIAS2", NULL, "CLK_SYS" },
{ "MICBIAS2", NULL, "MICBIAS Supply" },
}; };
static const struct snd_soc_dapm_route wm8994_intercon[] = { static const struct snd_soc_dapm_route wm8994_intercon[] = {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或