summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorStephen Warren2014-03-31 19:05:17 +0200
committerMark Brown2014-03-31 19:27:14 +0200
commit03a620d8fa5f5423b87aa93e49bfa79b731c5790 (patch)
tree187b71372df9de7e81fa9d422a3575dc65f33b59 /sound
parentMerge remote-tracking branches 'asoc/topic/tdm' and 'asoc/topic/tegra' into a... (diff)
downloadkernel-qcow2-linux-03a620d8fa5f5423b87aa93e49bfa79b731c5790.tar.gz
kernel-qcow2-linux-03a620d8fa5f5423b87aa93e49bfa79b731c5790.tar.xz
kernel-qcow2-linux-03a620d8fa5f5423b87aa93e49bfa79b731c5790.zip
ASoC: rt5640: add an of_match table
Add a device tree match table. This serves to make the driver's support of device tree more explicit. Perhaps the fallback for DT matching to using the i2c_device_id table will go away one day, since it fails in face of devices from different vendors with the same name. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/rt5640.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c
index 0061ae6b6716..68b4dd622b87 100644
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
@@ -2074,6 +2074,14 @@ static const struct i2c_device_id rt5640_i2c_id[] = {
};
MODULE_DEVICE_TABLE(i2c, rt5640_i2c_id);
+#if defined(CONFIG_OF)
+static const struct of_device_id rt5640_of_match[] = {
+ { .compatible = "realtek,rt5640", },
+ {},
+};
+MODULE_DEVICE_TABLE(of, rt5640_of_match);
+#endif
+
#ifdef CONFIG_ACPI
static struct acpi_device_id rt5640_acpi_match[] = {
{ "INT33CA", 0 },
@@ -2203,6 +2211,7 @@ static struct i2c_driver rt5640_i2c_driver = {
.name = "rt5640",
.owner = THIS_MODULE,
.acpi_match_table = ACPI_PTR(rt5640_acpi_match),
+ .of_match_table = of_match_ptr(rt5640_of_match),
},
.probe = rt5640_i2c_probe,
.remove = rt5640_i2c_remove,