From 76db9687b6c4476469d61ddf49c21868aedb2c72 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Fri, 18 Nov 2011 16:39:26 +0200 Subject: [PATCH] --- yaml --- r: 307998 b: refs/heads/master c: 2ec1be372139328b1aa3203eb1fd61d613b2d7fb h: refs/heads/master v: v3 --- [refs] | 2 +- .../devicetree/bindings/sound/omap-dmic.txt | 21 +++++++++++++++++++ trunk/sound/soc/omap/omap-dmic.c | 8 +++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 trunk/Documentation/devicetree/bindings/sound/omap-dmic.txt diff --git a/[refs] b/[refs] index 4e7b5e58a83e..35612400bec9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7cb8a1b5bae163c7aa746ffc02a641df6ed32f73 +refs/heads/master: 2ec1be372139328b1aa3203eb1fd61d613b2d7fb diff --git a/trunk/Documentation/devicetree/bindings/sound/omap-dmic.txt b/trunk/Documentation/devicetree/bindings/sound/omap-dmic.txt new file mode 100644 index 000000000000..fd8105f18978 --- /dev/null +++ b/trunk/Documentation/devicetree/bindings/sound/omap-dmic.txt @@ -0,0 +1,21 @@ +* Texas Instruments OMAP4+ Digital Microphone Module + +Required properties: +- compatible: "ti,omap4-dmic" +- reg: Register location and size as an array: + , + ; +- interrupts: Interrupt number for DMIC +- interrupt-parent: The parent interrupt controller +- ti,hwmods: Name of the hwmod associated with OMAP dmic IP + +Example: + +dmic: dmic@4012e000 { + compatible = "ti,omap4-dmic"; + reg = <0x4012e000 0x7f>, /* MPU private access */ + <0x4902e000 0x7f>; /* L3 Interconnect */ + interrupts = <0 114 0x4>; + interrupt-parent = <&gic>; + ti,hwmods = "dmic"; +}; diff --git a/trunk/sound/soc/omap/omap-dmic.c b/trunk/sound/soc/omap/omap-dmic.c index 4dcb5a7e40e8..75f5dca0e8d2 100644 --- a/trunk/sound/soc/omap/omap-dmic.c +++ b/trunk/sound/soc/omap/omap-dmic.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -528,10 +529,17 @@ static int __devexit asoc_dmic_remove(struct platform_device *pdev) return 0; } +static const struct of_device_id omap_dmic_of_match[] = { + { .compatible = "ti,omap4-dmic", }, + { } +}; +MODULE_DEVICE_TABLE(of, omap_dmic_of_match); + static struct platform_driver asoc_dmic_driver = { .driver = { .name = "omap-dmic", .owner = THIS_MODULE, + .of_match_table = omap_dmic_of_match, }, .probe = asoc_dmic_probe, .remove = __devexit_p(asoc_dmic_remove),