From 1c1d04d477bf8a35938e67561abb3c5966595ee3 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 3 Aug 2011 16:52:47 +0900
Subject: [PATCH] --- yaml --- r: 270496 b: refs/heads/master c:
 1552c8f67ea70803b18e2c7c525a8da5f90384c1 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0692bafb99e5..b2b8fe5c910b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 733eef3e96726350888bd0ec1526f2561bec44ed
+refs/heads/master: 1552c8f67ea70803b18e2c7c525a8da5f90384c1
diff --git a/trunk/Documentation/devicetree/bindings/sound/wm8711.txt b/trunk/Documentation/devicetree/bindings/sound/wm8711.txt
new file mode 100644
index 000000000000..8ed9998cd23c
--- /dev/null
+++ b/trunk/Documentation/devicetree/bindings/sound/wm8711.txt
@@ -0,0 +1,18 @@
+WM8711 audio CODEC
+
+This device supports both I2C and SPI (configured with pin strapping
+on the board).
+
+Required properties:
+
+  - compatible : "wlf,wm8711"
+
+  - reg : the I2C address of the device for I2C, the chip select
+          number for SPI.
+
+Example:
+
+codec: wm8711@1a {
+	compatible = "wlf,wm8711";
+	reg = <0x1a>;
+};
diff --git a/trunk/sound/soc/codecs/wm8711.c b/trunk/sound/soc/codecs/wm8711.c
index e1db7e416675..8457d3cb5962 100644
--- a/trunk/sound/soc/codecs/wm8711.c
+++ b/trunk/sound/soc/codecs/wm8711.c
@@ -21,6 +21,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>
@@ -414,6 +415,12 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8711 = {
 	.num_dapm_routes = ARRAY_SIZE(wm8711_intercon),
 };
 
+static const struct of_device_id wm8711_of_match[] = {
+	{ .compatible = "wlf,wm8711", },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, wm8711_of_match);
+
 #if defined(CONFIG_SPI_MASTER)
 static int __devinit wm8711_spi_probe(struct spi_device *spi)
 {
@@ -445,6 +452,7 @@ static struct spi_driver wm8711_spi_driver = {
 	.driver = {
 		.name	= "wm8711",
 		.owner	= THIS_MODULE,
+		.of_match_table = wm8711_of_match,
 	},
 	.probe		= wm8711_spi_probe,
 	.remove		= __devexit_p(wm8711_spi_remove),
@@ -489,6 +497,7 @@ static struct i2c_driver wm8711_i2c_driver = {
 	.driver = {
 		.name = "wm8711",
 		.owner = THIS_MODULE,
+		.of_match_table = wm8711_of_match,
 	},
 	.probe =    wm8711_i2c_probe,
 	.remove =   __devexit_p(wm8711_i2c_remove),