summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiam Girdwood2013-09-13 18:57:36 +0200
committerMark Brown2013-09-17 01:40:55 +0200
commit02b80773de3732dae11c1cf0c1ce40378901bd0e (patch)
treef55e6a26254750bb673869f7838ecfcac0da39d6
parentASoC: rt5640: Provide more useful hw_params error reasons. (diff)
downloadkernel-qcow2-linux-02b80773de3732dae11c1cf0c1ce40378901bd0e.tar.gz
kernel-qcow2-linux-02b80773de3732dae11c1cf0c1ce40378901bd0e.tar.xz
kernel-qcow2-linux-02b80773de3732dae11c1cf0c1ce40378901bd0e.zip
ASoC: rt5640: Add ACPI probing support.
Allow the RT5640 to be probed as an ACPI I2C device. Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--sound/soc/codecs/rt5640.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
index de40bd9f6ac2..0bfb960e90f8 100644
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -21,6 +21,7 @@
#include <linux/of_gpio.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>
@@ -2081,6 +2082,12 @@ static const struct i2c_device_id rt5640_i2c_id[] = {
};
MODULE_DEVICE_TABLE(i2c, rt5640_i2c_id);
+static struct acpi_device_id rt5640_acpi_match[] = {
+ { "INT33CA", 0 },
+ { },
+};
+MODULE_DEVICE_TABLE(acpi, rt5640_acpi_match);
+
static int rt5640_parse_dt(struct rt5640_priv *rt5640, struct device_node *np)
{
rt5640->pdata.in1_diff = of_property_read_bool(np,
@@ -2200,6 +2207,7 @@ static struct i2c_driver rt5640_i2c_driver = {
.driver = {
.name = "rt5640",
.owner = THIS_MODULE,
+ .acpi_match_table = ACPI_PTR(rt5640_acpi_match),
},
.probe = rt5640_i2c_probe,
.remove = rt5640_i2c_remove,