ASoC: Make pmdown_time a per-card setting
PATCH 1/2 ASoC: Make pmdown_time a per-card setting
Make the pmdown_time a per-card setting rather than a global one, initialised before the card initialisation runs. This allows cards to override the default setting if it makes sense to do so (for example, due to an unavoidable pop).
--- include/sound/soc.h | 2 ++ sound/soc/soc-core.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletions(-)
include/sound/soc.h +2 -0
@@ -521,6 +521,8 @@ struct snd_soc_card {int (*set_bias_level)(struct snd_soc_card *,enum snd_soc_bias_level level); +int pmdown_time; +/* CPU <--> Codec DAI links */ struct snd_soc_dai_link *dai_link;int num_links;
sound/soc/soc-core.c +3 -1
@@ -542,7 +542,7 @@ static int soc_codec_close(struct snd_pcm_substream *substream)/* start delayed pop wq here for playback streams */ codec_dai->pop_wait =1 ;schedule_delayed_work (&card->delayed_work, -msecs_to_jiffies (pmdown_time)); +msecs_to_jiffies (card->pmdown_time)); }else {/* capture streams can be powered down now */ snd_soc_dapm_stream_event(codec,
@@ -1039,6 +1039,8 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)dev_dbg (card->dev,"All components present, instantiating\n" );/* Found everything, bring it up */ + card->pmdown_time = pmdown_time; +if (card->probe) { ret = card->probe (pdev);if (ret <0 )
Signature · 1 line
1.6.6.1
PATCH 2/2 ASoC: Make pmdown_time runtime configurable
Provide a sysfs file allowing userspace to inspect and change the pmdown_time setting at runtime.
--- sound/soc/soc-core.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-)
sound/soc/soc-core.c +27 -0
@@ -130,6 +130,29 @@ static ssize_t codec_reg_show(struct device *dev, static DEVICE_ATTR(codec_reg, 0444, codec_reg_show, NULL); +static ssize_t pmdown_time_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +struct snd_soc_device *socdev =dev_get_drvdata (dev); +struct snd_soc_card *card = socdev->card; + +return sprintf (buf,"%d\n" , card->pmdown_time); +} + +static ssize_t pmdown_time_set (struct device *dev, +struct device_attribute *attr, +const char *buf,size_t count) +{ +struct snd_soc_device *socdev =dev_get_drvdata (dev); +struct snd_soc_card *card = socdev->card; + +strict_strtol (buf,10 , &card->pmdown_time); + +return count; +} + +static DEVICE_ATTR(pmdown_time, 0644, pmdown_time_show, pmdown_time_set); +#ifdef CONFIG_DEBUG_FS static int codec_reg_open_file (struct inode *inode,struct file *file) {
@@ -1124,6 +1147,10 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)if (ret <0 )printk (KERN_WARNING "asoc: failed to add dapm sysfs entries\n" ); + ret =device_create_file (card->socdev->dev, &dev_attr_pmdown_time); +if (ret <0 ) +printk (KERN_WARNING "asoc: failed to add pmdown_time sysfs\n" ); + ret =device_create_file (card->socdev->dev, &dev_attr_codec_reg);if (ret <0 )printk (KERN_WARNING "asoc: failed to add codec sysfs files\n" );
Signature · 1 line
1.6.6.1
Re: [PATCH 2/2] ASoC: Make pmdown_time runtime configurable
Quoted 8 lines · Mark Brown
Provide a sysfs file allowing userspace to inspect and change the
pmdown_timesetting at runtime.Signed-off-by Mark Brown <[email protected]>--- sound/soc/soc-core.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-)
Btw, I wonder if we should make this configurable via alsa-lib in the future (probably could be part of a QoS API). It's on my todo list now.
Liam
Signature · 3 lines
Freelance Developer, SlimLogic Ltd ASoC and Voltage Regulator Maintainer. http://www.slimlogic.co.uk
Re: [PATCH 2/2] ASoC: Make pmdown_time runtime configurable
In reply to Mark BrownQuoted 4 lines · Mark Brown
Provide a sysfs file allowing userspace to inspect and change the
pmdown_timesetting at runtime.Signed-off-by Mark Brown <[email protected]>
Thanks for doing this,
Quoted 6 lines · Mark Brown
Make the
pmdown_timea per-card setting rather than a global one, initialised before the card initialisation runs. This allows cards to override the default setting if it makes sense to do so (for example, due to an unavoidable pop).Signed-off-by Mark Brown <[email protected]>
Signature · 3 lines
Freelance Developer, SlimLogic Ltd ASoC and Voltage Regulator Maintainer. http://www.slimlogic.co.uk