diff options
| author | Bard Liao <bardliao@realtek.com> | 2015-02-17 13:59:26 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-21 18:30:14 +0900 |
| commit | 7371bd1f4aeb4e1c44b8c1ba8e36ebba4250b59c (patch) | |
| tree | 608fb13f5ed333ed712101962d00d17140148a51 /sound | |
| parent | bfa76d49576599a4b9f9b7a71f23d73d6dcff735 (diff) | |
| download | linux-stable-7371bd1f4aeb4e1c44b8c1ba8e36ebba4250b59c.tar.gz linux-stable-7371bd1f4aeb4e1c44b8c1ba8e36ebba4250b59c.tar.bz2 linux-stable-7371bd1f4aeb4e1c44b8c1ba8e36ebba4250b59c.zip | |
ASoC: rt5670: Add disabled item in dmic pin enum
Currently, we will configure dmic related pin definition if pdata.dmic_en
is true. However, there is no disable option in the enum. So, any dmic is
used, all 3 dmic related pins will be configured. It may cause unexpected
pin definition. This patch adds a disable item for each dmic enum and
take it as default. So the driver will not set the pin configuration if
we don't set dmicx_data_pin in platform data.
Signed-off-by: Bard Liao <bardliao@realtek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/rt5670.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/rt5670.h b/sound/soc/codecs/rt5670.h index d11b9c207e26..84857bdaa78b 100644 --- a/sound/soc/codecs/rt5670.h +++ b/sound/soc/codecs/rt5670.h @@ -1967,17 +1967,20 @@ enum { }; enum { + RT5670_DMIC1_DISABLED, RT5670_DMIC_DATA_GPIO6, RT5670_DMIC_DATA_IN2P, RT5670_DMIC_DATA_GPIO7, }; enum { + RT5670_DMIC2_DISABLED, RT5670_DMIC_DATA_GPIO8, RT5670_DMIC_DATA_IN3N, }; enum { + RT5670_DMIC3_DISABLED, RT5670_DMIC_DATA_GPIO9, RT5670_DMIC_DATA_GPIO10, RT5670_DMIC_DATA_GPIO5, |