diff options
| author |   Mark Brown <broonie@kernel.org> | 2019-04-04 15:07:34 +0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-04-04 15:07:34 +0700 |
| commit | 072cb68a43663eacae7fe84dcbfd1a81dc692185 (patch) | |
| tree | 95107e9ba2b85f6aabee0c830603a2cc48d32d07 /sound/soc/rockchip | |
| parent | ASoC: rockchip: pdm: optimize clear logic (diff) | |
| parent | ASoC: rockchip: pdm: change dma burst to 8 (diff) | |
| download | wireguard-linux-072cb68a43663eacae7fe84dcbfd1a81dc692185.tar.xz wireguard-linux-072cb68a43663eacae7fe84dcbfd1a81dc692185.zip | |
Merge branch 'asoc-5.1' into asoc-5.2
Diffstat (limited to 'sound/soc/rockchip')
| -rw-r--r-- | sound/soc/rockchip/rockchip_pdm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/rockchip/rockchip_pdm.c b/sound/soc/rockchip/rockchip_pdm.c index eb5216dd7dbc..c50494b0ed0d 100644 --- a/sound/soc/rockchip/rockchip_pdm.c +++ b/sound/soc/rockchip/rockchip_pdm.c @@ -24,7 +24,7 @@ #include "rockchip_pdm.h" -#define PDM_DMA_BURST_SIZE (16) /* size * width: 16*4 = 64 bytes */ +#define PDM_DMA_BURST_SIZE (8) /* size * width: 8*4 = 32 bytes */ struct rk_pdm_dev { struct device *dev; @@ -206,7 +206,9 @@ static int rockchip_pdm_set_fmt(struct snd_soc_dai *cpu_dai, return -EINVAL; } + pm_runtime_get_sync(cpu_dai->dev); regmap_update_bits(pdm->regmap, PDM_CLK_CTRL, mask, val); + pm_runtime_put(cpu_dai->dev); return 0; } |