diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-03 04:31:26 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-15 09:58:47 -0400 |
commit | 80080ec5399acb4e83f1216b24fd07e93c5c4b2c (patch) | |
tree | be3b577905fb9fb1e90e2d4f1fa054ec20eadf89 /sound/soc/codecs/wm8741.c | |
parent | a595238bad3d11b26d00bbda4ccbd38fe107cd1e (diff) |
ASoC: Add device tree binding for WM8741
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm8741.c')
-rw-r--r-- | sound/soc/codecs/wm8741.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8741.c b/sound/soc/codecs/wm8741.c index 9f6e952da8ec..78c9e5ab3fa5 100644 --- a/sound/soc/codecs/wm8741.c +++ b/sound/soc/codecs/wm8741.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
22 | #include <linux/regulator/consumer.h> | 22 | #include <linux/regulator/consumer.h> |
23 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
24 | #include <linux/of_device.h> | ||
24 | #include <sound/core.h> | 25 | #include <sound/core.h> |
25 | #include <sound/pcm.h> | 26 | #include <sound/pcm.h> |
26 | #include <sound/pcm_params.h> | 27 | #include <sound/pcm_params.h> |
@@ -498,6 +499,12 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8741 = { | |||
498 | .reg_cache_default = wm8741_reg_defaults, | 499 | .reg_cache_default = wm8741_reg_defaults, |
499 | }; | 500 | }; |
500 | 501 | ||
502 | static const struct of_device_id wm8741_of_match[] = { | ||
503 | { .compatible = "wlf,wm8741", }, | ||
504 | { } | ||
505 | }; | ||
506 | MODULE_DEVICE_TABLE(of, wm8741_of_match); | ||
507 | |||
501 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 508 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) |
502 | static int wm8741_i2c_probe(struct i2c_client *i2c, | 509 | static int wm8741_i2c_probe(struct i2c_client *i2c, |
503 | const struct i2c_device_id *id) | 510 | const struct i2c_device_id *id) |
@@ -541,6 +548,7 @@ static struct i2c_driver wm8741_i2c_driver = { | |||
541 | .driver = { | 548 | .driver = { |
542 | .name = "wm8741", | 549 | .name = "wm8741", |
543 | .owner = THIS_MODULE, | 550 | .owner = THIS_MODULE, |
551 | .of_match_table = wm8741_of_match, | ||
544 | }, | 552 | }, |
545 | .probe = wm8741_i2c_probe, | 553 | .probe = wm8741_i2c_probe, |
546 | .remove = wm8741_i2c_remove, | 554 | .remove = wm8741_i2c_remove, |
@@ -579,6 +587,7 @@ static struct spi_driver wm8741_spi_driver = { | |||
579 | .driver = { | 587 | .driver = { |
580 | .name = "wm8741", | 588 | .name = "wm8741", |
581 | .owner = THIS_MODULE, | 589 | .owner = THIS_MODULE, |
590 | .of_match_table = wm8741_of_match, | ||
582 | }, | 591 | }, |
583 | .probe = wm8741_spi_probe, | 592 | .probe = wm8741_spi_probe, |
584 | .remove = __devexit_p(wm8741_spi_remove), | 593 | .remove = __devexit_p(wm8741_spi_remove), |