diff options
author | Mark Brown <broonie@kernel.org> | 2015-02-09 15:10:03 +0800 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-02-09 15:10:03 +0800 |
commit | e1e62305afa275b435c8215dc0e799e6f188fe4f (patch) | |
tree | def8ca2756b48e5e948c65e9f5aa5d932a763c14 /include/sound | |
parent | 103004749235915190b81108f6bf4dbf53f220b9 (diff) | |
parent | 60d66c9a24907c8c965be4c7d15f67bd9d54b553 (diff) | |
download | op-kernel-dev-e1e62305afa275b435c8215dc0e799e6f188fe4f.zip op-kernel-dev-e1e62305afa275b435c8215dc0e799e6f188fe4f.tar.gz |
Merge remote-tracking branch 'asoc/topic/w-codec' into asoc-next
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/rt5677.h | 3 | ||||
-rw-r--r-- | include/sound/soc-dapm.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/sound/rt5677.h b/include/sound/rt5677.h index d9eb7d8..a620704 100644 --- a/include/sound/rt5677.h +++ b/include/sound/rt5677.h @@ -37,6 +37,9 @@ struct rt5677_platform_data { OFF, GPIO4, GPIO5 and GPIO6 respectively */ unsigned int jd2_gpio; unsigned int jd3_gpio; + + /* Set MICBIAS1 VDD 1v8 or 3v3 */ + bool micbias1_vdd_3v3; }; #endif diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index a2a0cf6..8d7416e 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -525,7 +525,6 @@ struct snd_soc_dapm_widget { enum snd_soc_dapm_type id; const char *name; /* widget name */ const char *sname; /* stream name */ - struct snd_soc_codec *codec; struct list_head list; struct snd_soc_dapm_context *dapm; |