summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam2012-12-13 02:28:04 +0100
committerMark Brown2012-12-24 16:36:57 +0100
commit5ce568329e4fcf9e9050bff878f8157ca43bc882 (patch)
treeba67bc2c95ce80b84e9a31985ea34c876c588e25
parentLinux 3.8-rc1 (diff)
downloadkernel-qcow2-linux-5ce568329e4fcf9e9050bff878f8157ca43bc882.tar.gz
kernel-qcow2-linux-5ce568329e4fcf9e9050bff878f8157ca43bc882.tar.xz
kernel-qcow2-linux-5ce568329e4fcf9e9050bff878f8157ca43bc882.zip
ASoC: wm8962: Add device tree support
Add device tree support. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--Documentation/devicetree/bindings/sound/wm8962.txt16
-rw-r--r--sound/soc/codecs/wm8962.c7
2 files changed, 23 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/sound/wm8962.txt b/Documentation/devicetree/bindings/sound/wm8962.txt
new file mode 100644
index 000000000000..dceb3b1c2bb7
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/wm8962.txt
@@ -0,0 +1,16 @@
+WM8962 audio CODEC
+
+This device supports I2C only.
+
+Required properties:
+
+ - compatible : "wlf,wm8962"
+
+ - reg : the I2C address of the device.
+
+Example:
+
+codec: wm8962@1a {
+ compatible = "wlf,wm8962";
+ reg = <0x1a>;
+};
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index bd4b0db4cdaa..705d0a0e9137 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -3758,10 +3758,17 @@ static const struct i2c_device_id wm8962_i2c_id[] = {
};
MODULE_DEVICE_TABLE(i2c, wm8962_i2c_id);
+static const struct of_device_id wm8962_of_match[] = {
+ { .compatible = "wlf,wm8962", },
+ { }
+};
+MODULE_DEVICE_TABLE(of, wm8962_of_match);
+
static struct i2c_driver wm8962_i2c_driver = {
.driver = {
.name = "wm8962",
.owner = THIS_MODULE,
+ .of_match_table = wm8962_of_match,
.pm = &wm8962_pm,
},
.probe = wm8962_i2c_probe,