summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorFang, Yang A <yang.a.fang@intel.com>2017-09-08 01:13:07 -0400
committerMark Brown <broonie@kernel.org>2017-09-19 09:43:16 -0400
commita10953f5d33b2334c8fb1799084ab49347a59821 (patch)
tree131a69133a14978b6291bea7298002e02bdf93a4 /sound
parent2bd6bf03f4c1c59381d62c61d03f6cc3fe71f66e (diff)
ASoC: ts3a227e: add acpi table
This patch adds the acpi match table for the ts3a227e audio accessory detection device. This enables headset features like jack plug/unplug notifications, mic presence, and button pressed events. Signed-off-by: Fang, Yang A <yang.a.fang@intel.com> Signed-off-by: Thierry Escande <thierry.escande@collabora.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Acked-By: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/ts3a227e.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/sound/soc/codecs/ts3a227e.c b/sound/soc/codecs/ts3a227e.c
index 43568435c208..738e04b09116 100644
--- a/sound/soc/codecs/ts3a227e.c
+++ b/sound/soc/codecs/ts3a227e.c
@@ -15,6 +15,7 @@
15#include <linux/module.h> 15#include <linux/module.h>
16#include <linux/of_gpio.h> 16#include <linux/of_gpio.h>
17#include <linux/regmap.h> 17#include <linux/regmap.h>
18#include <linux/acpi.h>
18 19
19#include <sound/core.h> 20#include <sound/core.h>
20#include <sound/jack.h> 21#include <sound/jack.h>
@@ -374,11 +375,20 @@ static const struct of_device_id ts3a227e_of_match[] = {
374}; 375};
375MODULE_DEVICE_TABLE(of, ts3a227e_of_match); 376MODULE_DEVICE_TABLE(of, ts3a227e_of_match);
376 377
378#ifdef CONFIG_ACPI
379static struct acpi_device_id ts3a227e_acpi_match[] = {
380 { "104C227E", 0 },
381 {},
382};
383MODULE_DEVICE_TABLE(acpi, ts3a227e_acpi_match);
384#endif
385
377static struct i2c_driver ts3a227e_driver = { 386static struct i2c_driver ts3a227e_driver = {
378 .driver = { 387 .driver = {
379 .name = "ts3a227e", 388 .name = "ts3a227e",
380 .pm = &ts3a227e_pm, 389 .pm = &ts3a227e_pm,
381 .of_match_table = of_match_ptr(ts3a227e_of_match), 390 .of_match_table = of_match_ptr(ts3a227e_of_match),
391 .acpi_match_table = ACPI_PTR(ts3a227e_acpi_match),
382 }, 392 },
383 .probe = ts3a227e_i2c_probe, 393 .probe = ts3a227e_i2c_probe,
384 .id_table = ts3a227e_i2c_ids, 394 .id_table = ts3a227e_i2c_ids,