summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-02 13:08:13 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-14 13:41:28 +0900
commitbf5a85be9739ea26f05874992cb05a9c774f359f (patch)
treececd613e46b7d295fdc9fea2b921d6b380500297
parent0a422e1a19e1583913d6f762882f115605109107 (diff)
downloadblackbird-op-linux-bf5a85be9739ea26f05874992cb05a9c774f359f.tar.gz
blackbird-op-linux-bf5a85be9739ea26f05874992cb05a9c774f359f.zip
ASoC: Add device tree binding for WM8523
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com>
-rw-r--r--Documentation/devicetree/bindings/sound/wm8523.txt16
-rw-r--r--sound/soc/codecs/wm8523.c7
2 files changed, 23 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/sound/wm8523.txt b/Documentation/devicetree/bindings/sound/wm8523.txt
new file mode 100644
index 000000000000..04746186b283
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/wm8523.txt
@@ -0,0 +1,16 @@
+WM8523 audio CODEC
+
+This device supports I2C only.
+
+Required properties:
+
+ - compatible : "wlf,wm8523"
+
+ - reg : the I2C address of the device.
+
+Example:
+
+codec: wm8523@1a {
+ compatible = "wlf,wm8523";
+ reg = <0x1a>;
+};
diff --git a/sound/soc/codecs/wm8523.c b/sound/soc/codecs/wm8523.c
index 131200917c56..52812d1a90e4 100644
--- a/sound/soc/codecs/wm8523.c
+++ b/sound/soc/codecs/wm8523.c
@@ -20,6 +20,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>
@@ -514,6 +515,11 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8523 = {
.volatile_register = wm8523_volatile_register,
};
+static const struct of_device_id wm8523_of_match[] = {
+ { .compatible = "wlf,wm8523" },
+ { },
+};
+
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
static __devinit int wm8523_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
@@ -553,6 +559,7 @@ static struct i2c_driver wm8523_i2c_driver = {
.driver = {
.name = "wm8523",
.owner = THIS_MODULE,
+ .of_match_table = wm8523_of_match,
},
.probe = wm8523_i2c_probe,
.remove = __devexit_p(wm8523_i2c_remove),
OpenPOWER on IntegriCloud