diff mbox

[2/3] ASoC: rt5677: Add ACPI device probing

Message ID 1412372246-10489-2-git-send-email-benzh@chromium.org (mailing list archive)
State New, archived
Headers show

Commit Message

Ben Zhang Oct. 3, 2014, 9:37 p.m. UTC 
The rt5677 codec driver looks for ACPI device ID "RT5677CE",
which is specified in coreboot.

Signed-off-by: Ben Zhang <benzh@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/207622
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Reviewed-by: AndyX C Huang <andyx.c.huang@intel.com>
---
 sound/soc/codecs/rt5677.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

Comments

Mark Brown Oct. 7, 2014, 7:12 p.m. UTC | #1 
On Fri, Oct 03, 2014 at 02:37:25PM -0700, Ben Zhang wrote:

> +#ifdef CONFIG_ACPI
> +		.acpi_match_table = ACPI_PTR(rt5677_acpi_id),
> +#endif

Why do you need this ifdef - surely the whole point of ACPI_PTR() is to
avoid needing it?
diff mbox

Patch

diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c
index cecbdb1..19dbb8a 100644
--- a/sound/soc/codecs/rt5677.c
+++ b/sound/soc/codecs/rt5677.c
@@ -20,6 +20,7 @@ 
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
 #include <linux/spi/spi.h>
+#include <linux/acpi.h>
 #include <linux/gpio.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -3680,10 +3681,21 @@  static int rt5677_i2c_remove(struct i2c_client *i2c)
 	return 0;
 }
 
+#ifdef CONFIG_ACPI
+static const struct acpi_device_id rt5677_acpi_id[] = {
+	{ "RT5677CE", 0 },
+	{ }
+};
+MODULE_DEVICE_TABLE(acpi, rt5677_acpi_id);
+#endif
+
 static struct i2c_driver rt5677_i2c_driver = {
 	.driver = {
 		.name = "rt5677",
 		.owner = THIS_MODULE,
+#ifdef CONFIG_ACPI
+		.acpi_match_table = ACPI_PTR(rt5677_acpi_id),
+#endif
 	},
 	.probe = rt5677_i2c_probe,
 	.remove   = rt5677_i2c_remove,