From 8191fd38fb3272f7695968634ea87947bb8774ba Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 22 Nov 2011 18:59:28 +0000
Subject: [PATCH] --- yaml --- r: 284543 b: refs/heads/master c:
 35ca98423a4c61decc20cd1d1e78a7fd7111e4db h: refs/heads/master i:   284541:
 a7d755e5fae9ab5fa1abd1e930549665cf280b52   284539:
 b447346225ef1ee109643f8898c0c49873ad92b4   284535:
 f82d299f3157759fd479dffbff45c4c991acd3f6   284527:
 dd009a288e68ac9b1a51317842852c3373bc2548   284511:
 2c65e0e1c23a0176b11dd0e425c52ad76a0a263c   284479:
 dd516ab63ba9ecb6cb87cd9d919165181f36f5fa   284415:
 c7a42c4c1fd28dd74c21ce5b4306685bb41095a0 v: v3

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

diff --git a/[refs] b/[refs]
index d85e88209cc1..9aafe6e4ddba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b46a36c0e0adc92c8be2c8a6fa68d979f6eee124
+refs/heads/master: 35ca98423a4c61decc20cd1d1e78a7fd7111e4db
diff --git a/trunk/Documentation/devicetree/bindings/sound/wm8994.txt b/trunk/Documentation/devicetree/bindings/sound/wm8994.txt
new file mode 100644
index 000000000000..7a7eb1e7bda6
--- /dev/null
+++ b/trunk/Documentation/devicetree/bindings/sound/wm8994.txt
@@ -0,0 +1,18 @@
+WM1811/WM8994/WM8958 audio CODEC
+
+These devices support both I2C and SPI (configured with pin strapping
+on the board).
+
+Required properties:
+
+  - compatible : "wlf,wm1811", "wlf,wm8994", "wlf,wm8958"
+
+  - reg : the I2C address of the device for I2C, the chip select
+          number for SPI.
+
+Example:
+
+codec: wm8994@1a {
+	compatible = "wlf,wm8994";
+	reg = <0x1a>;
+};
diff --git a/trunk/drivers/mfd/wm8994-core.c b/trunk/drivers/mfd/wm8994-core.c
index 776298b313ab..e6663248141f 100644
--- a/trunk/drivers/mfd/wm8994-core.c
+++ b/trunk/drivers/mfd/wm8994-core.c
@@ -582,6 +582,14 @@ static void wm8994_device_exit(struct wm8994 *wm8994)
 	regmap_exit(wm8994->regmap);
 }
 
+static const struct of_device_id wm8994_of_match[] = {
+	{ .compatible = "wlf,wm1811", },
+	{ .compatible = "wlf,wm8994", },
+	{ .compatible = "wlf,wm8958", },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, wm8994_of_match);
+
 static int wm8994_i2c_probe(struct i2c_client *i2c,
 			    const struct i2c_device_id *id)
 {
@@ -633,6 +641,7 @@ static struct i2c_driver wm8994_i2c_driver = {
 		.name = "wm8994",
 		.owner = THIS_MODULE,
 		.pm = &wm8994_pm_ops,
+		.of_match_table = wm8994_of_match,
 	},
 	.probe = wm8994_i2c_probe,
 	.remove = wm8994_i2c_remove,