aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/ux500/ux500_msp_dai.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-09-22 18:47:58 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-09-22 18:47:58 -0400
commit2ef39e606bb43d6041b6d820e2a9156110a82d21 (patch)
tree7c4cb8bd147d962344d357569172dfbe35f098a6 /sound/soc/ux500/ux500_msp_dai.c
parentASoC: wm2000: Add regulator support (diff)
parentDocumentation: Define the MSP Driver Device Tree bindings (diff)
downloadlinux-dev-2ef39e606bb43d6041b6d820e2a9156110a82d21.tar.xz
linux-dev-2ef39e606bb43d6041b6d820e2a9156110a82d21.zip
Merge remote-tracking branch 'asoc/topic/ux500' into for-3.7
Diffstat (limited to 'sound/soc/ux500/ux500_msp_dai.c')
-rw-r--r--sound/soc/ux500/ux500_msp_dai.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c
index 772cb19d2fb3..be94bf9bf94f 100644
--- a/sound/soc/ux500/ux500_msp_dai.c
+++ b/sound/soc/ux500/ux500_msp_dai.c
@@ -833,10 +833,16 @@ static int __devexit ux500_msp_drv_remove(struct platform_device *pdev)
return 0;
}
+static const struct of_device_id ux500_msp_i2s_match[] = {
+ { .compatible = "stericsson,ux500-msp-i2s", },
+ {},
+};
+
static struct platform_driver msp_i2s_driver = {
.driver = {
.name = "ux500-msp-i2s",
.owner = THIS_MODULE,
+ .of_match_table = ux500_msp_i2s_match,
},
.probe = ux500_msp_drv_probe,
.remove = ux500_msp_drv_remove,