From ecce7502fef7153e38459f99e28deb61b525ee28 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 3 Aug 2011 17:31:26 +0900
Subject: [PATCH] --- yaml --- r: 270514 b: refs/heads/master c:
 80080ec5399acb4e83f1216b24fd07e93c5c4b2c h: refs/heads/master v: v3

---
 [refs]                                         |  2 +-
 .../devicetree/bindings/sound/wm8741.txt       | 18 ++++++++++++++++++
 trunk/sound/soc/codecs/wm8741.c                |  9 +++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 trunk/Documentation/devicetree/bindings/sound/wm8741.txt

diff --git a/[refs] b/[refs]
index 983d1885f03f..9b8a7e2ee4f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a595238bad3d11b26d00bbda4ccbd38fe107cd1e
+refs/heads/master: 80080ec5399acb4e83f1216b24fd07e93c5c4b2c
diff --git a/trunk/Documentation/devicetree/bindings/sound/wm8741.txt b/trunk/Documentation/devicetree/bindings/sound/wm8741.txt
new file mode 100644
index 000000000000..74bda58c1bcf
--- /dev/null
+++ b/trunk/Documentation/devicetree/bindings/sound/wm8741.txt
@@ -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>;
+};
diff --git a/trunk/sound/soc/codecs/wm8741.c b/trunk/sound/soc/codecs/wm8741.c
index 9f6e952da8ec..78c9e5ab3fa5 100644
--- a/trunk/sound/soc/codecs/wm8741.c
+++ b/trunk/sound/soc/codecs/wm8741.c
@@ -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>
@@ -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)
@@ -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,
@@ -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),