diff options
author | Bard Liao <bardliao@realtek.com> | 2015-02-17 00:59:26 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-02-21 04:30:14 -0500 |
commit | 7371bd1f4aeb4e1c44b8c1ba8e36ebba4250b59c (patch) | |
tree | 608fb13f5ed333ed712101962d00d17140148a51 | |
parent | bfa76d49576599a4b9f9b7a71f23d73d6dcff735 (diff) |
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>
-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 { | |||
1967 | }; | 1967 | }; |
1968 | 1968 | ||
1969 | enum { | 1969 | enum { |
1970 | RT5670_DMIC1_DISABLED, | ||
1970 | RT5670_DMIC_DATA_GPIO6, | 1971 | RT5670_DMIC_DATA_GPIO6, |
1971 | RT5670_DMIC_DATA_IN2P, | 1972 | RT5670_DMIC_DATA_IN2P, |
1972 | RT5670_DMIC_DATA_GPIO7, | 1973 | RT5670_DMIC_DATA_GPIO7, |
1973 | }; | 1974 | }; |
1974 | 1975 | ||
1975 | enum { | 1976 | enum { |
1977 | RT5670_DMIC2_DISABLED, | ||
1976 | RT5670_DMIC_DATA_GPIO8, | 1978 | RT5670_DMIC_DATA_GPIO8, |
1977 | RT5670_DMIC_DATA_IN3N, | 1979 | RT5670_DMIC_DATA_IN3N, |
1978 | }; | 1980 | }; |
1979 | 1981 | ||
1980 | enum { | 1982 | enum { |
1983 | RT5670_DMIC3_DISABLED, | ||
1981 | RT5670_DMIC_DATA_GPIO9, | 1984 | RT5670_DMIC_DATA_GPIO9, |
1982 | RT5670_DMIC_DATA_GPIO10, | 1985 | RT5670_DMIC_DATA_GPIO10, |
1983 | RT5670_DMIC_DATA_GPIO5, | 1986 | RT5670_DMIC_DATA_GPIO5, |