aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-02 00:03:04 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-14 00:41:24 -0400
commit0a422e1a19e1583913d6f762882f115605109107 (patch)
tree6560a0cb83391ae3ab344f4c4471f63170ebda2a /sound/soc
parentc18eee31812d42ecd0aa5c39d21d41c15b30eaab (diff)
ASoC: Add device tree binding for WM8510
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/wm8510.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c
index db0dced74843..55a4c830e111 100644
--- a/sound/soc/codecs/wm8510.c
+++ b/sound/soc/codecs/wm8510.c
@@ -20,6 +20,7 @@
20#include <linux/platform_device.h> 20#include <linux/platform_device.h>
21#include <linux/spi/spi.h> 21#include <linux/spi/spi.h>
22#include <linux/slab.h> 22#include <linux/slab.h>
23#include <linux/of_device.h>
23#include <sound/core.h> 24#include <sound/core.h>
24#include <sound/pcm.h> 25#include <sound/pcm.h>
25#include <sound/pcm_params.h> 26#include <sound/pcm_params.h>
@@ -598,6 +599,11 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8510 = {
598 .reg_cache_default =wm8510_reg, 599 .reg_cache_default =wm8510_reg,
599}; 600};
600 601
602static const struct of_device_id wm8510_of_match[] = {
603 { .compatible = "wlf,wm8510" },
604 { },
605};
606
601#if defined(CONFIG_SPI_MASTER) 607#if defined(CONFIG_SPI_MASTER)
602static int __devinit wm8510_spi_probe(struct spi_device *spi) 608static int __devinit wm8510_spi_probe(struct spi_device *spi)
603{ 609{
@@ -628,6 +634,7 @@ static struct spi_driver wm8510_spi_driver = {
628 .driver = { 634 .driver = {
629 .name = "wm8510", 635 .name = "wm8510",
630 .owner = THIS_MODULE, 636 .owner = THIS_MODULE,
637 .of_match_table = wm8510_of_match,
631 }, 638 },
632 .probe = wm8510_spi_probe, 639 .probe = wm8510_spi_probe,
633 .remove = __devexit_p(wm8510_spi_remove), 640 .remove = __devexit_p(wm8510_spi_remove),
@@ -671,6 +678,7 @@ static struct i2c_driver wm8510_i2c_driver = {
671 .driver = { 678 .driver = {
672 .name = "wm8510-codec", 679 .name = "wm8510-codec",
673 .owner = THIS_MODULE, 680 .owner = THIS_MODULE,
681 .of_match_table = wm8510_of_match,
674 }, 682 },
675 .probe = wm8510_i2c_probe, 683 .probe = wm8510_i2c_probe,
676 .remove = __devexit_p(wm8510_i2c_remove), 684 .remove = __devexit_p(wm8510_i2c_remove),