Skip to content

Commit

Permalink
ASoC: Add device tree binding for WM8510
Browse files Browse the repository at this point in the history
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
  • Loading branch information
Mark Brown committed Aug 14, 2011
1 parent c18eee3 commit 0a422e1
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 0 deletions.
18 changes: 18 additions & 0 deletions Documentation/devicetree/bindings/sound/wm8510.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
WM8510 audio CODEC

This device supports both I2C and SPI (configured with pin strapping
on the board).

Required properties:

- compatible : "wlf,wm8510"

- reg : the I2C address of the device for I2C, the chip select
number for SPI.

Example:

codec: wm8510@1a {
compatible = "wlf,wm8510";
reg = <0x1a>;
};
8 changes: 8 additions & 0 deletions sound/soc/codecs/wm8510.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <linux/platform_device.h>
#include <linux/spi/spi.h>
#include <linux/slab.h>
#include <linux/of_device.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
Expand Down Expand Up @@ -598,6 +599,11 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8510 = {
.reg_cache_default =wm8510_reg,
};

static const struct of_device_id wm8510_of_match[] = {
{ .compatible = "wlf,wm8510" },
{ },
};

#if defined(CONFIG_SPI_MASTER)
static int __devinit wm8510_spi_probe(struct spi_device *spi)
{
Expand Down Expand Up @@ -628,6 +634,7 @@ static struct spi_driver wm8510_spi_driver = {
.driver = {
.name = "wm8510",
.owner = THIS_MODULE,
.of_match_table = wm8510_of_match,
},
.probe = wm8510_spi_probe,
.remove = __devexit_p(wm8510_spi_remove),
Expand Down Expand Up @@ -671,6 +678,7 @@ static struct i2c_driver wm8510_i2c_driver = {
.driver = {
.name = "wm8510-codec",
.owner = THIS_MODULE,
.of_match_table = wm8510_of_match,
},
.probe = wm8510_i2c_probe,
.remove = __devexit_p(wm8510_i2c_remove),
Expand Down

0 comments on commit 0a422e1

Please sign in to comment.