From 9c33d6174875cae991fe0b9429ee4a72cf286342 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 22 Nov 2011 18:22:29 +0000
Subject: [PATCH] --- yaml --- r: 283921 b: refs/heads/master c:
 cf763c2e606e9e427ed854c470911e816be1101e h: refs/heads/master i:   283919:
 a538eebd05c4e0bfc16ce54cf53b3cbb48ab946a 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 f2cbf0217f07..a47b7ac3c375 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 583cca6e2b1c4bc70dab49d030fc4f795cba5cfe
+refs/heads/master: cf763c2e606e9e427ed854c470911e816be1101e
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 5d6ba132837e..74d4746086c6 100644
--- a/trunk/drivers/mfd/wm8994-core.c
+++ b/trunk/drivers/mfd/wm8994-core.c
@@ -581,6 +581,14 @@ static void wm8994_device_exit(struct wm8994 *wm8994)
 	kfree(wm8994);
 }
 
+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,