diff options
author | Liam Girdwood <liam.r.girdwood@linux.intel.com> | 2013-09-13 12:57:36 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-16 19:40:55 -0400 |
commit | 02b80773de3732dae11c1cf0c1ce40378901bd0e (patch) | |
tree | f55e6a26254750bb673869f7838ecfcac0da39d6 | |
parent | 9e9cb9b99615180b94d743f1d6ca0f82539c8754 (diff) |
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.c | 8 |
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 @@ | |||
21 | #include <linux/of_gpio.h> | 21 | #include <linux/of_gpio.h> |
22 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
23 | #include <linux/spi/spi.h> | 23 | #include <linux/spi/spi.h> |
24 | #include <linux/acpi.h> | ||
24 | #include <sound/core.h> | 25 | #include <sound/core.h> |
25 | #include <sound/pcm.h> | 26 | #include <sound/pcm.h> |
26 | #include <sound/pcm_params.h> | 27 | #include <sound/pcm_params.h> |
@@ -2081,6 +2082,12 @@ static const struct i2c_device_id rt5640_i2c_id[] = { | |||
2081 | }; | 2082 | }; |
2082 | MODULE_DEVICE_TABLE(i2c, rt5640_i2c_id); | 2083 | MODULE_DEVICE_TABLE(i2c, rt5640_i2c_id); |
2083 | 2084 | ||
2085 | static struct acpi_device_id rt5640_acpi_match[] = { | ||
2086 | { "INT33CA", 0 }, | ||
2087 | { }, | ||
2088 | }; | ||
2089 | MODULE_DEVICE_TABLE(acpi, rt5640_acpi_match); | ||
2090 | |||
2084 | static int rt5640_parse_dt(struct rt5640_priv *rt5640, struct device_node *np) | 2091 | static int rt5640_parse_dt(struct rt5640_priv *rt5640, struct device_node *np) |
2085 | { | 2092 | { |
2086 | rt5640->pdata.in1_diff = of_property_read_bool(np, | 2093 | rt5640->pdata.in1_diff = of_property_read_bool(np, |
@@ -2200,6 +2207,7 @@ static struct i2c_driver rt5640_i2c_driver = { | |||
2200 | .driver = { | 2207 | .driver = { |
2201 | .name = "rt5640", | 2208 | .name = "rt5640", |
2202 | .owner = THIS_MODULE, | 2209 | .owner = THIS_MODULE, |
2210 | .acpi_match_table = ACPI_PTR(rt5640_acpi_match), | ||
2203 | }, | 2211 | }, |
2204 | .probe = rt5640_i2c_probe, | 2212 | .probe = rt5640_i2c_probe, |
2205 | .remove = rt5640_i2c_remove, | 2213 | .remove = rt5640_i2c_remove, |