leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: core: add platform DAPM debugfs support

Browse Source 
Allow platform widgets to be visible in debugfs like codec widgets.

Signed-off-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Sebastien Guiriec 2012-02-15 15:25:31 +00:00 committed by Mark Brown
parent 48a8c3943d
commit 731f1ab290
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/sound/soc.h
View File

@ -706,6 +706,11 @@ struct snd_soc_platform {
struct list_head card_list; struct list_head card_list;
struct snd_soc_dapm_context dapm; struct snd_soc_dapm_context dapm;
#ifdef CONFIG_DEBUG_FS
struct dentry *debugfs_platform_root;
struct dentry *debugfs_dapm;
#endif
}; };
struct snd_soc_dai_link { struct snd_soc_dai_link {

32
sound/soc/soc-core.c
View File

@ -300,6 +300,27 @@ static void soc_cleanup_codec_debugfs(struct snd_soc_codec *codec)
debugfs_remove_recursive(codec->debugfs_codec_root); debugfs_remove_recursive(codec->debugfs_codec_root);
} }
static void soc_init_platform_debugfs(struct snd_soc_platform *platform)
{
struct dentry *debugfs_card_root = platform->card->debugfs_card_root;
platform->debugfs_platform_root = debugfs_create_dir(platform->name,
debugfs_card_root);
if (!platform->debugfs_platform_root) {
dev_warn(platform->dev,
"Failed to create platform debugfs directory\n");
return;
}
snd_soc_dapm_debugfs_init(&platform->dapm,
platform->debugfs_platform_root);
}
static void soc_cleanup_platform_debugfs(struct snd_soc_platform *platform)
{
debugfs_remove_recursive(platform->debugfs_platform_root);
}
static ssize_t codec_list_read_file(struct file *file, char __user *user_buf, static ssize_t codec_list_read_file(struct file *file, char __user *user_buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
@ -433,6 +454,14 @@ static inline void soc_cleanup_codec_debugfs(struct snd_soc_codec *codec)
{ {
} }
static inline void soc_init_platform_debugfs(struct snd_soc_platform *platform)
{
}
static inline void soc_cleanup_platform_debugfs(struct snd_soc_platform *platform)
{
}
static inline void soc_init_card_debugfs(struct snd_soc_card *card) static inline void soc_init_card_debugfs(struct snd_soc_card *card)
{ {
} }
@ -920,6 +949,7 @@ static void soc_remove_dai_link(struct snd_soc_card *card, int num, int order)
/* Make sure all DAPM widgets are freed */ /* Make sure all DAPM widgets are freed */
snd_soc_dapm_free(&platform->dapm); snd_soc_dapm_free(&platform->dapm);
soc_cleanup_platform_debugfs(platform);
platform->probed = 0; platform->probed = 0;
list_del(&platform->card_list); list_del(&platform->card_list);
module_put(platform->dev->driver->owner); module_put(platform->dev->driver->owner);
@ -1037,6 +1067,8 @@ static int soc_probe_platform(struct snd_soc_card *card,
if (!try_module_get(platform->dev->driver->owner)) if (!try_module_get(platform->dev->driver->owner))
return -ENODEV; return -ENODEV;
soc_init_platform_debugfs(platform);
if (driver->dapm_widgets) if (driver->dapm_widgets)
snd_soc_dapm_new_controls(&platform->dapm, snd_soc_dapm_new_controls(&platform->dapm,
driver->dapm_widgets, driver->num_dapm_widgets); driver->dapm_widgets, driver->num_dapm_widgets);