ASoC: Add device tree binding for WM8737
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 3 Aug 2011 07:53:22 +0000 (16:53 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 14 Aug 2011 04:42:43 +0000 (13:42 +0900)
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Documentation/devicetree/bindings/sound/wm8737.txt [new file with mode: 0644]
sound/soc/codecs/wm8737.c

diff --git a/Documentation/devicetree/bindings/sound/wm8737.txt b/Documentation/devicetree/bindings/sound/wm8737.txt
new file mode 100644 (file)
index 0000000..4bc2cea
--- /dev/null
@@ -0,0 +1,18 @@
+WM8737 audio CODEC
+
+This device supports both I2C and SPI (configured with pin strapping
+on the board).
+
+Required properties:
+
+  - compatible : "wlf,wm8737"
+
+  - reg : the I2C address of the device for I2C, the chip select
+          number for SPI.
+
+Example:
+
+codec: wm8737@1a {
+       compatible = "wlf,wm8737";
+       reg = <0x1a>;
+};
index 30c67d06a9043988f1a84ed6f4780b7c2502dbc3..f6aef58845c2dc31880529cdaa9510a96735e334 100644 (file)
@@ -20,6 +20,7 @@
 #include <linux/regulator/consumer.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>
@@ -634,6 +635,13 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8737 = {
        .reg_cache_default = wm8737_reg,
 };
 
+static const struct of_device_id wm8737_of_match[] = {
+       { .compatible = "wlf,wm8737", },
+       { }
+};
+
+MODULE_DEVICE_TABLE(of, wm8737_of_match);
+
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 static __devinit int wm8737_i2c_probe(struct i2c_client *i2c,
                                      const struct i2c_device_id *id)
@@ -673,6 +681,7 @@ static struct i2c_driver wm8737_i2c_driver = {
        .driver = {
                .name = "wm8737",
                .owner = THIS_MODULE,
+               .of_match_table = wm8737_of_match,
        },
        .probe =    wm8737_i2c_probe,
        .remove =   __devexit_p(wm8737_i2c_remove),
@@ -711,6 +720,7 @@ static struct spi_driver wm8737_spi_driver = {
        .driver = {
                .name   = "wm8737",
                .owner  = THIS_MODULE,
+               .of_match_table = wm8737_of_match,
        },
        .probe          = wm8737_spi_probe,
        .remove         = __devexit_p(wm8737_spi_remove),