diff options
author | Daniel Mack <zonque@gmail.com> | 2013-08-12 04:42:41 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-08-15 06:29:07 -0400 |
commit | c529ca4ab935c5a836bddec44cc80614df078a07 (patch) | |
tree | 04545d26e7be212cc9ca682b9dc8ae645d5cd76f | |
parent | a671468d336bc6c482ab04e88e6eaf38532270ee (diff) |
ASoC: pxa: add DT bindings for pxa2xx-pcm
The bindings do not carry any resources, as the module only registers
the ASoC platform driver.
Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | Documentation/devicetree/bindings/sound/mrvl,pxa2xx-pcm.txt | 15 | ||||
-rw-r--r-- | sound/soc/pxa/pxa2xx-pcm.c | 13 |
2 files changed, 26 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/sound/mrvl,pxa2xx-pcm.txt b/Documentation/devicetree/bindings/sound/mrvl,pxa2xx-pcm.txt new file mode 100644 index 000000000000..551fbb8348c2 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/mrvl,pxa2xx-pcm.txt | |||
@@ -0,0 +1,15 @@ | |||
1 | DT bindings for ARM PXA2xx PCM platform driver | ||
2 | |||
3 | This is just a dummy driver that registers the PXA ASoC platform driver. | ||
4 | It does not have any resources assigned. | ||
5 | |||
6 | Required properties: | ||
7 | |||
8 | - compatible 'mrvl,pxa-pcm-audio' | ||
9 | |||
10 | Example: | ||
11 | |||
12 | pxa_pcm_audio: snd_soc_pxa_audio { | ||
13 | compatible = "mrvl,pxa-pcm-audio"; | ||
14 | }; | ||
15 | |||
diff --git a/sound/soc/pxa/pxa2xx-pcm.c b/sound/soc/pxa/pxa2xx-pcm.c index 0aa2d695064a..806da27b8b67 100644 --- a/sound/soc/pxa/pxa2xx-pcm.c +++ b/sound/soc/pxa/pxa2xx-pcm.c | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <linux/dma-mapping.h> | 13 | #include <linux/dma-mapping.h> |
14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
15 | #include <linux/dmaengine.h> | 15 | #include <linux/dmaengine.h> |
16 | #include <linux/of.h> | ||
16 | 17 | ||
17 | #include <sound/core.h> | 18 | #include <sound/core.h> |
18 | #include <sound/soc.h> | 19 | #include <sound/soc.h> |
@@ -133,10 +134,18 @@ static int pxa2xx_soc_platform_remove(struct platform_device *pdev) | |||
133 | return 0; | 134 | return 0; |
134 | } | 135 | } |
135 | 136 | ||
137 | #ifdef CONFIG_OF | ||
138 | static const struct of_device_id snd_soc_pxa_audio_match[] = { | ||
139 | { .compatible = "mrvl,pxa-pcm-audio" }, | ||
140 | { } | ||
141 | }; | ||
142 | #endif | ||
143 | |||
136 | static struct platform_driver pxa_pcm_driver = { | 144 | static struct platform_driver pxa_pcm_driver = { |
137 | .driver = { | 145 | .driver = { |
138 | .name = "pxa-pcm-audio", | 146 | .name = "pxa-pcm-audio", |
139 | .owner = THIS_MODULE, | 147 | .owner = THIS_MODULE, |
148 | .of_match_table = of_match_ptr(snd_soc_pxa_audio_match), | ||
140 | }, | 149 | }, |
141 | 150 | ||
142 | .probe = pxa2xx_soc_platform_probe, | 151 | .probe = pxa2xx_soc_platform_probe, |