aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8580.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-02 00:22:36 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-14 00:41:38 -0400
commit733eef3e96726350888bd0ec1526f2561bec44ed (patch)
tree8db33ee9eb00f1a5f7e2c8d3e2b4a41e045d22a3 /sound/soc/codecs/wm8580.c
parentbf5a85be9739ea26f05874992cb05a9c774f359f (diff)
ASoC: Add device tree support for WM8580
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc/codecs/wm8580.c')
-rw-r--r--sound/soc/codecs/wm8580.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c
index 95ac6651094f..4664c3a76c78 100644
--- a/sound/soc/codecs/wm8580.c
+++ b/sound/soc/codecs/wm8580.c
@@ -26,6 +26,7 @@
26#include <linux/platform_device.h> 26#include <linux/platform_device.h>
27#include <linux/regulator/consumer.h> 27#include <linux/regulator/consumer.h>
28#include <linux/slab.h> 28#include <linux/slab.h>
29#include <linux/of_device.h>
29 30
30#include <sound/core.h> 31#include <sound/core.h>
31#include <sound/pcm.h> 32#include <sound/pcm.h>
@@ -907,6 +908,11 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8580 = {
907 .reg_cache_default = wm8580_reg, 908 .reg_cache_default = wm8580_reg,
908}; 909};
909 910
911static const struct of_device_id wm8580_of_match[] = {
912 { .compatible = "wlf,wm8580" },
913 { },
914};
915
910#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) 916#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
911static int wm8580_i2c_probe(struct i2c_client *i2c, 917static int wm8580_i2c_probe(struct i2c_client *i2c,
912 const struct i2c_device_id *id) 918 const struct i2c_device_id *id)
@@ -945,6 +951,7 @@ static struct i2c_driver wm8580_i2c_driver = {
945 .driver = { 951 .driver = {
946 .name = "wm8580", 952 .name = "wm8580",
947 .owner = THIS_MODULE, 953 .owner = THIS_MODULE,
954 .of_match_table = wm8580_of_match,
948 }, 955 },
949 .probe = wm8580_i2c_probe, 956 .probe = wm8580_i2c_probe,
950 .remove = wm8580_i2c_remove, 957 .remove = wm8580_i2c_remove,