Commit 66df9477 authored by Vitaly Rodionov's avatar Vitaly Rodionov Committed by Mark Brown

ASoC: cs42l42: Add support for ACPI table match entry

Adding support for ACPI-based systems.
Signed-off-by: default avatarVitaly Rodionov <vitalyr@opensource.cirrus.com>
Signed-off-by: default avatarLucas Tanure <tanureal@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20210426155303.853236-3-tanureal@opensource.cirrus.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent ab78322a
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/regmap.h> #include <linux/regmap.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/acpi.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/property.h> #include <linux/property.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
...@@ -2001,12 +2002,21 @@ static const struct dev_pm_ops cs42l42_runtime_pm = { ...@@ -2001,12 +2002,21 @@ static const struct dev_pm_ops cs42l42_runtime_pm = {
NULL) NULL)
}; };
#ifdef CONFIG_OF
static const struct of_device_id cs42l42_of_match[] = { static const struct of_device_id cs42l42_of_match[] = {
{ .compatible = "cirrus,cs42l42", }, { .compatible = "cirrus,cs42l42", },
{}, {}
}; };
MODULE_DEVICE_TABLE(of, cs42l42_of_match); MODULE_DEVICE_TABLE(of, cs42l42_of_match);
#endif
#ifdef CONFIG_ACPI
static const struct acpi_device_id cs42l42_acpi_match[] = {
{"10134242", 0,},
{}
};
MODULE_DEVICE_TABLE(acpi, cs42l42_acpi_match);
#endif
static const struct i2c_device_id cs42l42_id[] = { static const struct i2c_device_id cs42l42_id[] = {
{"cs42l42", 0}, {"cs42l42", 0},
...@@ -2019,7 +2029,8 @@ static struct i2c_driver cs42l42_i2c_driver = { ...@@ -2019,7 +2029,8 @@ static struct i2c_driver cs42l42_i2c_driver = {
.driver = { .driver = {
.name = "cs42l42", .name = "cs42l42",
.pm = &cs42l42_runtime_pm, .pm = &cs42l42_runtime_pm,
.of_match_table = cs42l42_of_match, .of_match_table = of_match_ptr(cs42l42_of_match),
.acpi_match_table = ACPI_PTR(cs42l42_acpi_match),
}, },
.id_table = cs42l42_id, .id_table = cs42l42_id,
.probe = cs42l42_i2c_probe, .probe = cs42l42_i2c_probe,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment