Skip to content

Commit

Permalink
ASoC: Add device tree binding for WM8741
Browse files Browse the repository at this point in the history
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Mark Brown committed Aug 15, 2011
1 parent a595238 commit 80080ec
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 0 deletions.
18 changes: 18 additions & 0 deletions Documentation/devicetree/bindings/sound/wm8741.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
WM8741 audio CODEC

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

Required properties:

- compatible : "wlf,wm8741"

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

Example:

codec: wm8741@1a {
compatible = "wlf,wm8741";
reg = <0x1a>;
};
9 changes: 9 additions & 0 deletions sound/soc/codecs/wm8741.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <linux/platform_device.h>
#include <linux/regulator/consumer.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 @@ -498,6 +499,12 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8741 = {
.reg_cache_default = wm8741_reg_defaults,
};

static const struct of_device_id wm8741_of_match[] = {
{ .compatible = "wlf,wm8741", },
{ }
};
MODULE_DEVICE_TABLE(of, wm8741_of_match);

#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
static int wm8741_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
Expand Down Expand Up @@ -541,6 +548,7 @@ static struct i2c_driver wm8741_i2c_driver = {
.driver = {
.name = "wm8741",
.owner = THIS_MODULE,
.of_match_table = wm8741_of_match,
},
.probe = wm8741_i2c_probe,
.remove = wm8741_i2c_remove,
Expand Down Expand Up @@ -579,6 +587,7 @@ static struct spi_driver wm8741_spi_driver = {
.driver = {
.name = "wm8741",
.owner = THIS_MODULE,
.of_match_table = wm8741_of_match,
},
.probe = wm8741_spi_probe,
.remove = __devexit_p(wm8741_spi_remove),
Expand Down

0 comments on commit 80080ec

Please sign in to comment.