Commit 4c8bcfd3 authored by Mark Brown's avatar Mark Brown

ASoC: mchp-spdiftx: add power saving features

Merge series from Claudiu Beznea <claudiu.beznea@microchip.com>:

This series adds support for runtime PM and system suspend/resume
for Microchip SPDIFTX (patches 2/3, 3/3). Along with it I took the
chance and added a minor cleanup (patch 1/3).
parents 041fe885 abc7edb0
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/pm_runtime.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <sound/asoundef.h> #include <sound/asoundef.h>
...@@ -175,6 +176,7 @@ static const struct regmap_config mchp_spdiftx_regmap_config = { ...@@ -175,6 +176,7 @@ static const struct regmap_config mchp_spdiftx_regmap_config = {
.readable_reg = mchp_spdiftx_readable_reg, .readable_reg = mchp_spdiftx_readable_reg,
.writeable_reg = mchp_spdiftx_writeable_reg, .writeable_reg = mchp_spdiftx_writeable_reg,
.precious_reg = mchp_spdiftx_precious_reg, .precious_reg = mchp_spdiftx_precious_reg,
.cache_type = REGCACHE_FLAT,
}; };
#define SPDIFTX_GCLK_RATIO 128 #define SPDIFTX_GCLK_RATIO 128
...@@ -196,7 +198,7 @@ struct mchp_spdiftx_dev { ...@@ -196,7 +198,7 @@ struct mchp_spdiftx_dev {
struct clk *pclk; struct clk *pclk;
struct clk *gclk; struct clk *gclk;
unsigned int fmt; unsigned int fmt;
unsigned int gclk_enabled:1; unsigned int suspend_irq;
}; };
static inline int mchp_spdiftx_is_running(struct mchp_spdiftx_dev *dev) static inline int mchp_spdiftx_is_running(struct mchp_spdiftx_dev *dev)
...@@ -317,16 +319,25 @@ static int mchp_spdiftx_trigger(struct snd_pcm_substream *substream, int cmd, ...@@ -317,16 +319,25 @@ static int mchp_spdiftx_trigger(struct snd_pcm_substream *substream, int cmd,
running = !!(mr & SPDIFTX_MR_TXEN_ENABLE); running = !!(mr & SPDIFTX_MR_TXEN_ENABLE);
switch (cmd) { switch (cmd) {
case SNDRV_PCM_TRIGGER_START:
case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_RESUME:
case SNDRV_PCM_TRIGGER_START:
regmap_write(dev->regmap, SPDIFTX_IER, dev->suspend_irq |
SPDIFTX_IR_TXUDR | SPDIFTX_IR_TXOVR);
dev->suspend_irq = 0;
fallthrough;
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
if (!running) { if (!running) {
mr &= ~SPDIFTX_MR_TXEN_MASK; mr &= ~SPDIFTX_MR_TXEN_MASK;
mr |= SPDIFTX_MR_TXEN_ENABLE; mr |= SPDIFTX_MR_TXEN_ENABLE;
} }
break; break;
case SNDRV_PCM_TRIGGER_STOP:
case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_SUSPEND:
regmap_read(dev->regmap, SPDIFTX_IMR, &dev->suspend_irq);
fallthrough;
case SNDRV_PCM_TRIGGER_STOP:
regmap_write(dev->regmap, SPDIFTX_IDR, dev->suspend_irq |
SPDIFTX_IR_TXUDR | SPDIFTX_IR_TXOVR);
fallthrough;
case SNDRV_PCM_TRIGGER_PAUSE_PUSH: case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
if (running) { if (running) {
mr &= ~SPDIFTX_MR_TXEN_MASK; mr &= ~SPDIFTX_MR_TXEN_MASK;
...@@ -355,6 +366,7 @@ static int mchp_spdiftx_hw_params(struct snd_pcm_substream *substream, ...@@ -355,6 +366,7 @@ static int mchp_spdiftx_hw_params(struct snd_pcm_substream *substream,
struct mchp_spdiftx_mixer_control *ctrl = &dev->control; struct mchp_spdiftx_mixer_control *ctrl = &dev->control;
u32 mr; u32 mr;
unsigned int bps = params_physical_width(params) / 8; unsigned int bps = params_physical_width(params) / 8;
unsigned char aes3;
int ret; int ret;
dev_dbg(dev->dev, "%s() rate=%u format=%#x width=%u channels=%u\n", dev_dbg(dev->dev, "%s() rate=%u format=%#x width=%u channels=%u\n",
...@@ -440,55 +452,54 @@ static int mchp_spdiftx_hw_params(struct snd_pcm_substream *substream, ...@@ -440,55 +452,54 @@ static int mchp_spdiftx_hw_params(struct snd_pcm_substream *substream,
mr |= SPDIFTX_MR_BPS(bps); mr |= SPDIFTX_MR_BPS(bps);
spin_lock_irqsave(&ctrl->lock, flags);
ctrl->ch_stat[3] &= ~IEC958_AES3_CON_FS;
switch (params_rate(params)) { switch (params_rate(params)) {
case 22050: case 22050:
ctrl->ch_stat[3] |= IEC958_AES3_CON_FS_22050; aes3 = IEC958_AES3_CON_FS_22050;
break; break;
case 24000: case 24000:
ctrl->ch_stat[3] |= IEC958_AES3_CON_FS_24000; aes3 = IEC958_AES3_CON_FS_24000;
break; break;
case 32000: case 32000:
ctrl->ch_stat[3] |= IEC958_AES3_CON_FS_32000; aes3 = IEC958_AES3_CON_FS_32000;
break; break;
case 44100: case 44100:
ctrl->ch_stat[3] |= IEC958_AES3_CON_FS_44100; aes3 = IEC958_AES3_CON_FS_44100;
break; break;
case 48000: case 48000:
ctrl->ch_stat[3] |= IEC958_AES3_CON_FS_48000; aes3 = IEC958_AES3_CON_FS_48000;
break; break;
case 88200: case 88200:
ctrl->ch_stat[3] |= IEC958_AES3_CON_FS_88200; aes3 = IEC958_AES3_CON_FS_88200;
break; break;
case 96000: case 96000:
ctrl->ch_stat[3] |= IEC958_AES3_CON_FS_96000; aes3 = IEC958_AES3_CON_FS_96000;
break; break;
case 176400: case 176400:
ctrl->ch_stat[3] |= IEC958_AES3_CON_FS_176400; aes3 = IEC958_AES3_CON_FS_176400;
break; break;
case 192000: case 192000:
ctrl->ch_stat[3] |= IEC958_AES3_CON_FS_192000; aes3 = IEC958_AES3_CON_FS_192000;
break; break;
case 8000: case 8000:
case 11025: case 11025:
case 16000: case 16000:
case 64000: case 64000:
ctrl->ch_stat[3] |= IEC958_AES3_CON_FS_NOTID; aes3 = IEC958_AES3_CON_FS_NOTID;
break; break;
default: default:
dev_err(dev->dev, "unsupported sample frequency: %u\n", dev_err(dev->dev, "unsupported sample frequency: %u\n",
params_rate(params)); params_rate(params));
spin_unlock_irqrestore(&ctrl->lock, flags);
return -EINVAL; return -EINVAL;
} }
spin_lock_irqsave(&ctrl->lock, flags);
ctrl->ch_stat[3] &= ~IEC958_AES3_CON_FS;
ctrl->ch_stat[3] |= aes3;
mchp_spdiftx_channel_status_write(dev); mchp_spdiftx_channel_status_write(dev);
spin_unlock_irqrestore(&ctrl->lock, flags); spin_unlock_irqrestore(&ctrl->lock, flags);
if (dev->gclk_enabled) { /* GCLK is enabled by runtime PM. */
clk_disable_unprepare(dev->gclk); clk_disable_unprepare(dev->gclk);
dev->gclk_enabled = 0;
}
ret = clk_set_rate(dev->gclk, params_rate(params) * ret = clk_set_rate(dev->gclk, params_rate(params) *
SPDIFTX_GCLK_RATIO); SPDIFTX_GCLK_RATIO);
if (ret) { if (ret) {
...@@ -502,14 +513,10 @@ static int mchp_spdiftx_hw_params(struct snd_pcm_substream *substream, ...@@ -502,14 +513,10 @@ static int mchp_spdiftx_hw_params(struct snd_pcm_substream *substream,
dev_err(dev->dev, "unable to enable gclk: %d\n", ret); dev_err(dev->dev, "unable to enable gclk: %d\n", ret);
return ret; return ret;
} }
dev->gclk_enabled = 1;
dev_dbg(dev->dev, "%s(): GCLK set to %d\n", __func__, dev_dbg(dev->dev, "%s(): GCLK set to %d\n", __func__,
params_rate(params) * SPDIFTX_GCLK_RATIO); params_rate(params) * SPDIFTX_GCLK_RATIO);
/* Enable interrupts */
regmap_write(dev->regmap, SPDIFTX_IER,
SPDIFTX_IR_TXUDR | SPDIFTX_IR_TXOVR);
regmap_write(dev->regmap, SPDIFTX_MR, mr); regmap_write(dev->regmap, SPDIFTX_MR, mr);
return 0; return 0;
...@@ -520,13 +527,6 @@ static int mchp_spdiftx_hw_free(struct snd_pcm_substream *substream, ...@@ -520,13 +527,6 @@ static int mchp_spdiftx_hw_free(struct snd_pcm_substream *substream,
{ {
struct mchp_spdiftx_dev *dev = snd_soc_dai_get_drvdata(dai); struct mchp_spdiftx_dev *dev = snd_soc_dai_get_drvdata(dai);
regmap_write(dev->regmap, SPDIFTX_IDR,
SPDIFTX_IR_TXUDR | SPDIFTX_IR_TXOVR);
if (dev->gclk_enabled) {
clk_disable_unprepare(dev->gclk);
dev->gclk_enabled = 0;
}
return regmap_write(dev->regmap, SPDIFTX_CR, return regmap_write(dev->regmap, SPDIFTX_CR,
SPDIFTX_CR_SWRST | SPDIFTX_CR_FCLR); SPDIFTX_CR_SWRST | SPDIFTX_CR_FCLR);
} }
...@@ -708,17 +708,9 @@ static struct snd_kcontrol_new mchp_spdiftx_ctrls[] = { ...@@ -708,17 +708,9 @@ static struct snd_kcontrol_new mchp_spdiftx_ctrls[] = {
static int mchp_spdiftx_dai_probe(struct snd_soc_dai *dai) static int mchp_spdiftx_dai_probe(struct snd_soc_dai *dai)
{ {
struct mchp_spdiftx_dev *dev = snd_soc_dai_get_drvdata(dai); struct mchp_spdiftx_dev *dev = snd_soc_dai_get_drvdata(dai);
int ret;
snd_soc_dai_init_dma_data(dai, &dev->playback, NULL); snd_soc_dai_init_dma_data(dai, &dev->playback, NULL);
ret = clk_prepare_enable(dev->pclk);
if (ret) {
dev_err(dev->dev,
"failed to enable the peripheral clock: %d\n", ret);
return ret;
}
/* Add controls */ /* Add controls */
snd_soc_add_dai_controls(dai, mchp_spdiftx_ctrls, snd_soc_add_dai_controls(dai, mchp_spdiftx_ctrls,
ARRAY_SIZE(mchp_spdiftx_ctrls)); ARRAY_SIZE(mchp_spdiftx_ctrls));
...@@ -726,19 +718,9 @@ static int mchp_spdiftx_dai_probe(struct snd_soc_dai *dai) ...@@ -726,19 +718,9 @@ static int mchp_spdiftx_dai_probe(struct snd_soc_dai *dai)
return 0; return 0;
} }
static int mchp_spdiftx_dai_remove(struct snd_soc_dai *dai)
{
struct mchp_spdiftx_dev *dev = snd_soc_dai_get_drvdata(dai);
clk_disable_unprepare(dev->pclk);
return 0;
}
static struct snd_soc_dai_driver mchp_spdiftx_dai = { static struct snd_soc_dai_driver mchp_spdiftx_dai = {
.name = "mchp-spdiftx", .name = "mchp-spdiftx",
.probe = mchp_spdiftx_dai_probe, .probe = mchp_spdiftx_dai_probe,
.remove = mchp_spdiftx_dai_remove,
.playback = { .playback = {
.stream_name = "S/PDIF Playback", .stream_name = "S/PDIF Playback",
.channels_min = 1, .channels_min = 1,
...@@ -762,6 +744,55 @@ static const struct of_device_id mchp_spdiftx_dt_ids[] = { ...@@ -762,6 +744,55 @@ static const struct of_device_id mchp_spdiftx_dt_ids[] = {
}; };
MODULE_DEVICE_TABLE(of, mchp_spdiftx_dt_ids); MODULE_DEVICE_TABLE(of, mchp_spdiftx_dt_ids);
static int mchp_spdiftx_runtime_suspend(struct device *dev)
{
struct mchp_spdiftx_dev *spdiftx = dev_get_drvdata(dev);
regcache_cache_only(spdiftx->regmap, true);
clk_disable_unprepare(spdiftx->gclk);
clk_disable_unprepare(spdiftx->pclk);
return 0;
}
static int mchp_spdiftx_runtime_resume(struct device *dev)
{
struct mchp_spdiftx_dev *spdiftx = dev_get_drvdata(dev);
int ret;
ret = clk_prepare_enable(spdiftx->pclk);
if (ret) {
dev_err(spdiftx->dev,
"failed to enable the peripheral clock: %d\n", ret);
return ret;
}
ret = clk_prepare_enable(spdiftx->gclk);
if (ret) {
dev_err(spdiftx->dev,
"failed to enable generic clock: %d\n", ret);
goto disable_pclk;
}
regcache_cache_only(spdiftx->regmap, false);
regcache_mark_dirty(spdiftx->regmap);
ret = regcache_sync(spdiftx->regmap);
if (ret) {
regcache_cache_only(spdiftx->regmap, true);
clk_disable_unprepare(spdiftx->gclk);
disable_pclk:
clk_disable_unprepare(spdiftx->pclk);
}
return ret;
}
static const struct dev_pm_ops mchp_spdiftx_pm_ops = {
SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume)
RUNTIME_PM_OPS(mchp_spdiftx_runtime_suspend, mchp_spdiftx_runtime_resume,
NULL)
};
static int mchp_spdiftx_probe(struct platform_device *pdev) static int mchp_spdiftx_probe(struct platform_device *pdev)
{ {
struct mchp_spdiftx_dev *dev; struct mchp_spdiftx_dev *dev;
...@@ -826,29 +857,59 @@ static int mchp_spdiftx_probe(struct platform_device *pdev) ...@@ -826,29 +857,59 @@ static int mchp_spdiftx_probe(struct platform_device *pdev)
dev->regmap = regmap; dev->regmap = regmap;
platform_set_drvdata(pdev, dev); platform_set_drvdata(pdev, dev);
pm_runtime_enable(dev->dev);
if (!pm_runtime_enabled(dev->dev)) {
err = mchp_spdiftx_runtime_resume(dev->dev);
if (err)
return err;
}
dev->playback.addr = (dma_addr_t)mem->start + SPDIFTX_CDR; dev->playback.addr = (dma_addr_t)mem->start + SPDIFTX_CDR;
dev->playback.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; dev->playback.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
err = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); err = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
if (err) { if (err) {
dev_err(&pdev->dev, "failed to register PMC: %d\n", err); dev_err(&pdev->dev, "failed to register PMC: %d\n", err);
return err; goto pm_runtime_suspend;
} }
err = devm_snd_soc_register_component(&pdev->dev, err = devm_snd_soc_register_component(&pdev->dev,
&mchp_spdiftx_component, &mchp_spdiftx_component,
&mchp_spdiftx_dai, 1); &mchp_spdiftx_dai, 1);
if (err) if (err) {
dev_err(&pdev->dev, "failed to register component: %d\n", err); dev_err(&pdev->dev, "failed to register component: %d\n", err);
goto pm_runtime_suspend;
}
return 0;
pm_runtime_suspend:
if (!pm_runtime_status_suspended(dev->dev))
mchp_spdiftx_runtime_suspend(dev->dev);
pm_runtime_disable(dev->dev);
return err; return err;
} }
static int mchp_spdiftx_remove(struct platform_device *pdev)
{
struct mchp_spdiftx_dev *dev = platform_get_drvdata(pdev);
if (!pm_runtime_status_suspended(dev->dev))
mchp_spdiftx_runtime_suspend(dev->dev);
pm_runtime_disable(dev->dev);
return 0;
}
static struct platform_driver mchp_spdiftx_driver = { static struct platform_driver mchp_spdiftx_driver = {
.probe = mchp_spdiftx_probe, .probe = mchp_spdiftx_probe,
.remove = mchp_spdiftx_remove,
.driver = { .driver = {
.name = "mchp_spdiftx", .name = "mchp_spdiftx",
.of_match_table = of_match_ptr(mchp_spdiftx_dt_ids), .of_match_table = of_match_ptr(mchp_spdiftx_dt_ids),
.pm = pm_ptr(&mchp_spdiftx_pm_ops)
}, },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment