diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-27 13:16:32 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-27 17:33:11 -0400 |
commit | 848dd8beef44df18f2eb61e00981b0692adb801b (patch) | |
tree | c860d13902c98fab86390e7b29027c063ffc3af5 /sound/soc/soc-utils.c | |
parent | 8842c72afe9f954d9462da577a25d4a32bfe0a2b (diff) |
ASoC: Add more natural support for no-DMA DAIs
Since we can now support multiple platforms allow machines to not specify
a platform in a DAI link. Since the rest of the code requires that we have
a struct device for all objects we do this by substituting in a dummy
device that we register automatically.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Jassi Brar <jassisinghbrar@gmail.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc/soc-utils.c')
-rw-r--r-- | sound/soc/soc-utils.c | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/sound/soc/soc-utils.c b/sound/soc/soc-utils.c index 3f45e6a439bf..286579140882 100644 --- a/sound/soc/soc-utils.c +++ b/sound/soc/soc-utils.c | |||
@@ -13,6 +13,7 @@ | |||
13 | * option) any later version. | 13 | * option) any later version. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include <linux/platform_device.h> | ||
16 | #include <sound/core.h> | 17 | #include <sound/core.h> |
17 | #include <sound/pcm.h> | 18 | #include <sound/pcm.h> |
18 | #include <sound/pcm_params.h> | 19 | #include <sound/pcm_params.h> |
@@ -55,3 +56,57 @@ int snd_soc_params_to_bclk(struct snd_pcm_hw_params *params) | |||
55 | return ret; | 56 | return ret; |
56 | } | 57 | } |
57 | EXPORT_SYMBOL_GPL(snd_soc_params_to_bclk); | 58 | EXPORT_SYMBOL_GPL(snd_soc_params_to_bclk); |
59 | |||
60 | static struct snd_soc_platform_driver dummy_platform; | ||
61 | |||
62 | static __devinit int snd_soc_dummy_probe(struct platform_device *pdev) | ||
63 | { | ||
64 | return snd_soc_register_platform(&pdev->dev, &dummy_platform); | ||
65 | } | ||
66 | |||
67 | static __devexit int snd_soc_dummy_remove(struct platform_device *pdev) | ||
68 | { | ||
69 | snd_soc_unregister_platform(&pdev->dev); | ||
70 | |||
71 | return 0; | ||
72 | } | ||
73 | |||
74 | static struct platform_driver soc_dummy_driver = { | ||
75 | .driver = { | ||
76 | .name = "snd-soc-dummy", | ||
77 | .owner = THIS_MODULE, | ||
78 | }, | ||
79 | .probe = snd_soc_dummy_probe, | ||
80 | .remove = __devexit_p(snd_soc_dummy_remove), | ||
81 | }; | ||
82 | |||
83 | static struct platform_device *soc_dummy_dev; | ||
84 | |||
85 | static int __init snd_soc_util_init(void) | ||
86 | { | ||
87 | int ret; | ||
88 | |||
89 | soc_dummy_dev = platform_device_alloc("snd-soc-dummy", -1); | ||
90 | if (!soc_dummy_dev) | ||
91 | return -ENOMEM; | ||
92 | |||
93 | ret = platform_device_add(soc_dummy_dev); | ||
94 | if (ret != 0) { | ||
95 | platform_device_put(soc_dummy_dev); | ||
96 | return ret; | ||
97 | } | ||
98 | |||
99 | ret = platform_driver_register(&soc_dummy_driver); | ||
100 | if (ret != 0) | ||
101 | platform_device_unregister(soc_dummy_dev); | ||
102 | |||
103 | return ret; | ||
104 | } | ||
105 | module_init(snd_soc_util_init); | ||
106 | |||
107 | static void __exit snd_soc_util_exit(void) | ||
108 | { | ||
109 | platform_device_unregister(soc_dummy_dev); | ||
110 | platform_driver_unregister(&soc_dummy_driver); | ||
111 | } | ||
112 | module_exit(snd_soc_util_exit); | ||