diff options
| author | Mark Brown <broonie@kernel.org> | 2017-07-03 16:15:04 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-07-03 16:15:04 +0100 |
| commit | 51fa6a8f15ddaaf8ecb0fe75b365c012905341fe (patch) | |
| tree | be71d720a241a31e3d58f6ffedc4799493351965 /sound/soc/codecs/rt5670.c | |
| parent | 9a532f0554ca8558e844a96b9df82cef747b437d (diff) | |
| parent | bdd0384a5ada8bb5745e5f29c10a5ba88827efad (diff) | |
| download | lwn-51fa6a8f15ddaaf8ecb0fe75b365c012905341fe.tar.gz lwn-51fa6a8f15ddaaf8ecb0fe75b365c012905341fe.zip | |
Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
Diffstat (limited to 'sound/soc/codecs/rt5670.c')
| -rw-r--r-- | sound/soc/codecs/rt5670.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sound/soc/codecs/rt5670.c b/sound/soc/codecs/rt5670.c index d95d2e693dc6..a5f15a104c47 100644 --- a/sound/soc/codecs/rt5670.c +++ b/sound/soc/codecs/rt5670.c @@ -2848,6 +2848,10 @@ static const struct dmi_system_id dmi_platform_intel_braswell[] = { DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad Tablet B"), }, }, + {} +}; + +static const struct dmi_system_id dmi_platform_intel_bytcht_jdmode2[] = { { .ident = "Lenovo Thinkpad Tablet 10", .matches = { @@ -2882,6 +2886,11 @@ static int rt5670_i2c_probe(struct i2c_client *i2c, rt5670->pdata.dmic1_data_pin = RT5670_DMIC_DATA_IN2P; rt5670->pdata.dev_gpio = true; rt5670->pdata.jd_mode = 1; + } else if (dmi_check_system(dmi_platform_intel_bytcht_jdmode2)) { + rt5670->pdata.dmic_en = true; + rt5670->pdata.dmic1_data_pin = RT5670_DMIC_DATA_IN2P; + rt5670->pdata.dev_gpio = true; + rt5670->pdata.jd_mode = 2; } rt5670->regmap = devm_regmap_init_i2c(i2c, &rt5670_regmap); |