[v3] ASoC: rt5670: set platform data by dmi

Commit Message

Bard Liao Dec. 18, 2014, 3:32 a.m. UTC

This patch set specific data according to dmi data.

Signed-off-by: Jin, Yao <[e-mail]>
Signed-off-by: Bard Liao <[e-mail]>
---
* Remove the __initconst in definition since the data of
  dmi_platform_intel_braswell[] could not be accessible by
  dmi_check_system().
---
 sound/soc/codecs/rt5670.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

Comments

Mark Brown Dec. 22, 2014, 1:32 p.m. UTC | #1

On Thu, Dec 18, 2014 at 11:32:52AM +0800, Bard Liao wrote:
> This patch set specific data according to dmi data.

Applied, thanks.

Patch

diff --git a/sound/soc/codecs/rt5670.c b/sound/soc/codecs/rt5670.c
index 8bf3a56..d6895aa 100644
--- a/sound/soc/codecs/rt5670.c
+++ b/sound/soc/codecs/rt5670.c
@@ -18,6 +18,7 @@ 
 #include <linux/platform_device.h>
 #include <linux/acpi.h>
 #include <linux/spi/spi.h>
+#include <linux/dmi.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -2549,6 +2550,17 @@  static struct acpi_device_id rt5670_acpi_match[] = {
 MODULE_DEVICE_TABLE(acpi, rt5670_acpi_match);
 #endif
 
+static const struct dmi_system_id dmi_platform_intel_braswell[] = {
+	{
+		.ident = "Intel Braswell",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"),
+			DMI_MATCH(DMI_BOARD_NAME, "Braswell CRB"),
+		},
+	},
+	{}
+};
+
 static int rt5670_i2c_probe(struct i2c_client *i2c,
 		    const struct i2c_device_id *id)
 {
@@ -2568,6 +2580,12 @@  static int rt5670_i2c_probe(struct i2c_client *i2c,
 	if (pdata)
 		rt5670->pdata = *pdata;
 
+	if (dmi_check_system(dmi_platform_intel_braswell)) {
+		rt5670->pdata.dmic_en = true;
+		rt5670->pdata.dmic1_data_pin = RT5670_DMIC_DATA_IN2P;
+		rt5670->pdata.jd_mode = 1;
+	}
+
 	rt5670->regmap = devm_regmap_init_i2c(i2c, &rt5670_regmap);
 	if (IS_ERR(rt5670->regmap)) {
 		ret = PTR_ERR(rt5670->regmap);