diff options
author | Fang, Yang A <yang.a.fang@intel.com> | 2015-04-23 19:35:17 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-04-24 06:08:20 -0400 |
commit | 3168c201f7ca333d12f80f8d98bbbe3a33746f8b (patch) | |
tree | 71e0b083d20ef06c97c739bf08b6cbaf48294785 /sound/soc | |
parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) |
ASoC: rt5645: Add ACPI match ID
This patch adds the ACPI match ID for rt5645/5650 codec
Signed-off-by: Fang, Yang A <yang.a.fang@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/codecs/rt5645.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index c9a4c5be083b..e16724a11c47 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/platform_device.h> | 18 | #include <linux/platform_device.h> |
19 | #include <linux/spi/spi.h> | 19 | #include <linux/spi/spi.h> |
20 | #include <linux/gpio.h> | 20 | #include <linux/gpio.h> |
21 | #include <linux/acpi.h> | ||
21 | #include <sound/core.h> | 22 | #include <sound/core.h> |
22 | #include <sound/pcm.h> | 23 | #include <sound/pcm.h> |
23 | #include <sound/pcm_params.h> | 24 | #include <sound/pcm_params.h> |
@@ -2618,6 +2619,15 @@ static const struct i2c_device_id rt5645_i2c_id[] = { | |||
2618 | }; | 2619 | }; |
2619 | MODULE_DEVICE_TABLE(i2c, rt5645_i2c_id); | 2620 | MODULE_DEVICE_TABLE(i2c, rt5645_i2c_id); |
2620 | 2621 | ||
2622 | #ifdef CONFIG_ACPI | ||
2623 | static struct acpi_device_id rt5645_acpi_match[] = { | ||
2624 | { "10EC5645", 0 }, | ||
2625 | { "10EC5650", 0 }, | ||
2626 | {}, | ||
2627 | }; | ||
2628 | MODULE_DEVICE_TABLE(acpi, rt5645_acpi_match); | ||
2629 | #endif | ||
2630 | |||
2621 | static int rt5645_i2c_probe(struct i2c_client *i2c, | 2631 | static int rt5645_i2c_probe(struct i2c_client *i2c, |
2622 | const struct i2c_device_id *id) | 2632 | const struct i2c_device_id *id) |
2623 | { | 2633 | { |
@@ -2834,6 +2844,7 @@ static struct i2c_driver rt5645_i2c_driver = { | |||
2834 | .driver = { | 2844 | .driver = { |
2835 | .name = "rt5645", | 2845 | .name = "rt5645", |
2836 | .owner = THIS_MODULE, | 2846 | .owner = THIS_MODULE, |
2847 | .acpi_match_table = ACPI_PTR(rt5645_acpi_match), | ||
2837 | }, | 2848 | }, |
2838 | .probe = rt5645_i2c_probe, | 2849 | .probe = rt5645_i2c_probe, |
2839 | .remove = rt5645_i2c_remove, | 2850 | .remove = rt5645_i2c_remove, |