Merge branch 'for-linus' of git://github.com/richardweinberger/linux

[deliverable/linux.git] / sound / soc / codecs / wm8728.c

diff --git a/sound/soc/codecs/wm8728.c b/sound/soc/codecs/wm8728.c
index 86d4718d3a76055e46c1982e526855905c871ac9..04b027efd5c003df25769eb92e3ff7a74317a975 100644 (file)
--- a/sound/soc/codecs/wm8728.c
+++ b/sound/soc/codecs/wm8728.c
@@ -19,6 +19,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>
@@ -269,6 +270,12 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8728 = {
        .num_dapm_routes = ARRAY_SIZE(wm8728_intercon),
 };
 
+static const struct of_device_id wm8728_of_match[] = {
+       { .compatible = "wlf,wm8728", },
+       { }
+};
+MODULE_DEVICE_TABLE(of, wm8728_of_match);
+
 #if defined(CONFIG_SPI_MASTER)
 static int __devinit wm8728_spi_probe(struct spi_device *spi)
 {
@@ -298,8 +305,9 @@ static int __devexit wm8728_spi_remove(struct spi_device *spi)
 
 static struct spi_driver wm8728_spi_driver = {
        .driver = {
-               .name   = "wm8728-codec",
+               .name   = "wm8728",
                .owner  = THIS_MODULE,
+               .of_match_table = wm8728_of_match,
        },
        .probe          = wm8728_spi_probe,
        .remove         = __devexit_p(wm8728_spi_remove),
@@ -342,8 +350,9 @@ MODULE_DEVICE_TABLE(i2c, wm8728_i2c_id);
 
 static struct i2c_driver wm8728_i2c_driver = {
        .driver = {
-               .name = "wm8728-codec",
+               .name = "wm8728",
                .owner = THIS_MODULE,
+               .of_match_table = wm8728_of_match,
        },
        .probe =    wm8728_i2c_probe,
        .remove =   __devexit_p(wm8728_i2c_remove),