Merge remote-tracking branch 'asoc/topic/rt5651' into asoc-next

1 files changed, 31 insertions, 0 deletions

diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c
index 1d4031818966..7a6197042423 100644
--- a/sound/soc/codecs/rt5651.c
+++ b/sound/soc/codecs/rt5651.c
@@ -18,6 +18,7 @@
 #include <linux/regmap.h>
 #include <linux/platform_device.h>
 #include <linux/spi/spi.h>
+#include <linux/acpi.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -1735,12 +1736,38 @@ static const struct regmap_config rt5651_regmap = {
         .num_ranges = ARRAY_SIZE(rt5651_ranges),
 };
 
+#if defined(CONFIG_OF)
+static const struct of_device_id rt5651_of_match[] = {
+        { .compatible = "realtek,rt5651", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, rt5651_of_match);
+#endif
+
+#ifdef CONFIG_ACPI
+static const struct acpi_device_id rt5651_acpi_match[] = {
+        { "10EC5651", 0 },
+        { },
+};
+MODULE_DEVICE_TABLE(acpi, rt5651_acpi_match);
+#endif
+
 static const struct i2c_device_id rt5651_i2c_id[] = {
         { "rt5651", 0 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, rt5651_i2c_id);
 
+static int rt5651_parse_dt(struct rt5651_priv *rt5651, struct device_node *np)
+{
+        rt5651->pdata.in2_diff = of_property_read_bool(np,
+                "realtek,in2-differential");
+        rt5651->pdata.dmic_en = of_property_read_bool(np,
+                "realtek,dmic-en");
+
+        return 0;
+}
+
 static int rt5651_i2c_probe(struct i2c_client *i2c,
                     const struct i2c_device_id *id)
 {
@@ -1757,6 +1784,8 @@ static int rt5651_i2c_probe(struct i2c_client *i2c,
 
         if (pdata)
                 rt5651->pdata = *pdata;
+        else if (i2c->dev.of_node)
+                rt5651_parse_dt(rt5651, i2c->dev.of_node);
 
         rt5651->regmap = devm_regmap_init_i2c(i2c, &rt5651_regmap);
         if (IS_ERR(rt5651->regmap)) {
@@ -1806,6 +1835,8 @@ static int rt5651_i2c_remove(struct i2c_client *i2c)
 static struct i2c_driver rt5651_i2c_driver = {
         .driver = {
                 .name = "rt5651",
+                .acpi_match_table = ACPI_PTR(rt5651_acpi_match),
+                .of_match_table = of_match_ptr(rt5651_of_match),
         },
         .probe = rt5651_i2c_probe,
         .remove   = rt5651_i2c_remove,