---

yaml --- r: 270495 b: refs/heads/master c: 733eef3 h: refs/heads/master i: 270493: 2a66d54 270491: f8bd98f 270487: 47c1353 270479: e3a1e56 270463: dd99ba8 v: v3
git-mirror · Aug 14, 2011 · de7ecf5 · de7ecf5
1 parent 9e0eaf8
commit de7ecf5
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf5a85be9739ea26f05874992cb05a9c774f359f
+refs/heads/master: 733eef3e96726350888bd0ec1526f2561bec44ed
diff --git a/trunk/Documentation/devicetree/bindings/sound/wm8580.txt b/trunk/Documentation/devicetree/bindings/sound/wm8580.txt
@@ -0,0 +1,16 @@
+WM8580 audio CODEC
+
+This device supports I2C only.
+
+Required properties:
+
+  - compatible : "wlf,wm8580"
+
+  - reg : the I2C address of the device.
+
+Example:
+
+codec: wm8580@1a {
+	compatible = "wlf,wm8580";
+	reg = <0x1a>;
+};
diff --git a/trunk/sound/soc/codecs/wm8580.c b/trunk/sound/soc/codecs/wm8580.c
@@ -26,6 +26,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>
@@ -907,6 +908,11 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8580 = {
 	.reg_cache_default = wm8580_reg,
 };
 
+static const struct of_device_id wm8580_of_match[] = {
+	{ .compatible = "wlf,wm8580" },
+	{ },
+};
+
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 static int wm8580_i2c_probe(struct i2c_client *i2c,
 			    const struct i2c_device_id *id)
@@ -945,6 +951,7 @@ static struct i2c_driver wm8580_i2c_driver = {
 	.driver = {
 		.name = "wm8580",
 		.owner = THIS_MODULE,
+		.of_match_table = wm8580_of_match,
 	},
 	.probe =    wm8580_i2c_probe,
 	.remove =   wm8580_i2c_remove,