aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2008-12-03 14:40:30 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2008-12-09 05:49:27 -0500
commit12a48a8c0087ba39d926cf1d63938ccbdb9752c3 (patch)
tree4fc400e27b9f524a908ec24b854131c435be2722
parent3f4b783cfdebb559814690572041a17bc9744cf3 (diff)
ASoC: Add platform registration API
ASoC v2 allows platform drivers to instantiate independantly of the overall ASoC card. This API allows drivers to notify the core when they are registered. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--include/sound/soc.h5
-rw-r--r--sound/soc/soc-core.c38
2 files changed, 43 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 4a578b5d855c..ce3661d07c24 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -149,6 +149,7 @@ struct snd_soc_ops;
149struct snd_soc_dai_mode; 149struct snd_soc_dai_mode;
150struct snd_soc_pcm_runtime; 150struct snd_soc_pcm_runtime;
151struct snd_soc_dai; 151struct snd_soc_dai;
152struct snd_soc_platform;
152struct snd_soc_codec; 153struct snd_soc_codec;
153struct soc_enum; 154struct soc_enum;
154struct snd_soc_ac97_ops; 155struct snd_soc_ac97_ops;
@@ -158,6 +159,9 @@ typedef int (*hw_read_t)(void *,char* ,int);
158 159
159extern struct snd_ac97_bus_ops soc_ac97_ops; 160extern struct snd_ac97_bus_ops soc_ac97_ops;
160 161
162int snd_soc_register_platform(struct snd_soc_platform *platform);
163void snd_soc_unregister_platform(struct snd_soc_platform *platform);
164
161/* pcm <-> DAI connect */ 165/* pcm <-> DAI connect */
162void snd_soc_free_pcms(struct snd_soc_device *socdev); 166void snd_soc_free_pcms(struct snd_soc_device *socdev);
163int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid); 167int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid);
@@ -296,6 +300,7 @@ struct snd_soc_codec_device {
296/* SoC platform interface */ 300/* SoC platform interface */
297struct snd_soc_platform { 301struct snd_soc_platform {
298 char *name; 302 char *name;
303 struct list_head list;
299 304
300 int (*probe)(struct platform_device *pdev); 305 int (*probe)(struct platform_device *pdev);
301 int (*remove)(struct platform_device *pdev); 306 int (*remove)(struct platform_device *pdev);
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 03460b068f1e..ffae370b45df 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -46,6 +46,7 @@ static struct dentry *debugfs_root;
46static DEFINE_MUTEX(client_mutex); 46static DEFINE_MUTEX(client_mutex);
47static LIST_HEAD(card_list); 47static LIST_HEAD(card_list);
48static LIST_HEAD(dai_list); 48static LIST_HEAD(dai_list);
49static LIST_HEAD(platform_list);
49 50
50static int snd_soc_register_card(struct snd_soc_card *card); 51static int snd_soc_register_card(struct snd_soc_card *card);
51static int snd_soc_unregister_card(struct snd_soc_card *card); 52static int snd_soc_unregister_card(struct snd_soc_card *card);
@@ -2102,6 +2103,43 @@ void snd_soc_unregister_dais(struct snd_soc_dai *dai, size_t count)
2102} 2103}
2103EXPORT_SYMBOL_GPL(snd_soc_unregister_dais); 2104EXPORT_SYMBOL_GPL(snd_soc_unregister_dais);
2104 2105
2106/**
2107 * snd_soc_register_platform - Register a platform with the ASoC core
2108 *
2109 * @param platform platform to register
2110 */
2111int snd_soc_register_platform(struct snd_soc_platform *platform)
2112{
2113 if (!platform->name)
2114 return -EINVAL;
2115
2116 INIT_LIST_HEAD(&platform->list);
2117
2118 mutex_lock(&client_mutex);
2119 list_add(&platform->list, &platform_list);
2120 mutex_unlock(&client_mutex);
2121
2122 pr_debug("Registered platform '%s'\n", platform->name);
2123
2124 return 0;
2125}
2126EXPORT_SYMBOL_GPL(snd_soc_register_platform);
2127
2128/**
2129 * snd_soc_unregister_platform - Unregister a platform from the ASoC core
2130 *
2131 * @param platform platform to unregister
2132 */
2133void snd_soc_unregister_platform(struct snd_soc_platform *platform)
2134{
2135 mutex_lock(&client_mutex);
2136 list_del(&platform->list);
2137 mutex_unlock(&client_mutex);
2138
2139 pr_debug("Unregistered platform '%s'\n", platform->name);
2140}
2141EXPORT_SYMBOL_GPL(snd_soc_unregister_platform);
2142
2105static int __devinit snd_soc_init(void) 2143static int __devinit snd_soc_init(void)
2106{ 2144{
2107#ifdef CONFIG_DEBUG_FS 2145#ifdef CONFIG_DEBUG_FS