public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ASoC: qcom: sdm845: handle soundwire stream

Browse source 
In existing setup WSA881x codec handles soundwire stream,
however DB845c and other machines based on SDM845c have 2
instances for WSA881x codec. This will force soundwire stream
to be prepared/enabled twice or multiple times.
Handling SoundWire Stream in machine driver would fix this issue.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200317151233.8763-2-srinivas.kandagatla@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Srinivas Kandagatla 2020-03-17 15:12:32 +00:00 • committed by Mark Brown
parent 16252a8f3a
commit 1b93a88431
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
2 changed files with 68 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sound/soc/qcom/Kconfig
View file

@ -99,7 +99,7 @@ config SND_SOC_MSM8996
config SND_SOC_SDM845 config SND_SOC_SDM845
tristate "SoC Machine driver for SDM845 boards" tristate "SoC Machine driver for SDM845 boards"
depends on QCOM_APR && CROS_EC && I2C depends on QCOM_APR && CROS_EC && I2C && SOUNDWIRE
select SND_SOC_QDSP6 select SND_SOC_QDSP6
select SND_SOC_QCOM_COMMON select SND_SOC_QCOM_COMMON
select SND_SOC_RT5663 select SND_SOC_RT5663

67
sound/soc/qcom/sdm845.c
View file

@ -11,6 +11,7 @@
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include <sound/jack.h> #include <sound/jack.h>
#include <sound/soc.h> #include <sound/soc.h>
#include <linux/soundwire/sdw.h>
#include <uapi/linux/input-event-codes.h> #include <uapi/linux/input-event-codes.h>
#include "common.h" #include "common.h"
#include "qdsp6/q6afe.h" #include "qdsp6/q6afe.h"
@ -31,10 +32,12 @@
struct sdm845_snd_data { struct sdm845_snd_data {
struct snd_soc_jack jack; struct snd_soc_jack jack;
bool jack_setup; bool jack_setup;
bool stream_prepared[SLIM_MAX_RX_PORTS];
struct snd_soc_card *card; struct snd_soc_card *card;
uint32_t pri_mi2s_clk_count; uint32_t pri_mi2s_clk_count;
uint32_t sec_mi2s_clk_count; uint32_t sec_mi2s_clk_count;
uint32_t quat_tdm_clk_count; uint32_t quat_tdm_clk_count;
struct sdw_stream_runtime *sruntime[SLIM_MAX_RX_PORTS];
}; };
static unsigned int tdm_slot_offset[8] = {0, 4, 8, 12, 16, 20, 24, 28}; static unsigned int tdm_slot_offset[8] = {0, 4, 8, 12, 16, 20, 24, 28};
@ -45,11 +48,18 @@ static int sdm845_slim_snd_hw_params(struct snd_pcm_substream *substream,
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct snd_soc_dai *cpu_dai = rtd->cpu_dai; struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
struct snd_soc_dai *codec_dai; struct snd_soc_dai *codec_dai;
struct sdm845_snd_data *pdata = snd_soc_card_get_drvdata(rtd->card);
u32 rx_ch[SLIM_MAX_RX_PORTS], tx_ch[SLIM_MAX_TX_PORTS]; u32 rx_ch[SLIM_MAX_RX_PORTS], tx_ch[SLIM_MAX_TX_PORTS];
struct sdw_stream_runtime *sruntime;
u32 rx_ch_cnt = 0, tx_ch_cnt = 0; u32 rx_ch_cnt = 0, tx_ch_cnt = 0;
int ret = 0, i; int ret = 0, i;
for_each_rtd_codec_dais(rtd, i, codec_dai) { for_each_rtd_codec_dais(rtd, i, codec_dai) {
sruntime = snd_soc_dai_get_sdw_stream(codec_dai,
substream->stream);
if (sruntime != ERR_PTR(-ENOTSUPP))
pdata->sruntime[cpu_dai->id] = sruntime;
ret = snd_soc_dai_get_channel_map(codec_dai, ret = snd_soc_dai_get_channel_map(codec_dai,
&tx_ch_cnt, tx_ch, &rx_ch_cnt, rx_ch); &tx_ch_cnt, tx_ch, &rx_ch_cnt, rx_ch);
@ -425,8 +435,65 @@ static void sdm845_snd_shutdown(struct snd_pcm_substream *substream)
} }
} }
static int sdm845_snd_prepare(struct snd_pcm_substream *substream)
{
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct sdm845_snd_data *data = snd_soc_card_get_drvdata(rtd->card);
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
struct sdw_stream_runtime *sruntime = data->sruntime[cpu_dai->id];
int ret;
if (!sruntime)
return 0;
if (data->stream_prepared[cpu_dai->id]) {
sdw_disable_stream(sruntime);
sdw_deprepare_stream(sruntime);
data->stream_prepared[cpu_dai->id] = false;
}
ret = sdw_prepare_stream(sruntime);
if (ret)
return ret;
/**
* NOTE: there is a strict hw requirement about the ordering of port
* enables and actual WSA881x PA enable. PA enable should only happen
* after soundwire ports are enabled if not DC on the line is
* accumulated resulting in Click/Pop Noise
* PA enable/mute are handled as part of codec DAPM and digital mute.
*/
ret = sdw_enable_stream(sruntime);
if (ret) {
sdw_deprepare_stream(sruntime);
return ret;
}
data->stream_prepared[cpu_dai->id] = true;
return ret;
}
static int sdm845_snd_hw_free(struct snd_pcm_substream *substream)
{
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct sdm845_snd_data *data = snd_soc_card_get_drvdata(rtd->card);
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
struct sdw_stream_runtime *sruntime = data->sruntime[cpu_dai->id];
if (sruntime && data->stream_prepared[cpu_dai->id]) {
sdw_disable_stream(sruntime);
sdw_deprepare_stream(sruntime);
data->stream_prepared[cpu_dai->id] = false;
}
return 0;
}
static const struct snd_soc_ops sdm845_be_ops = { static const struct snd_soc_ops sdm845_be_ops = {
.hw_params = sdm845_snd_hw_params, .hw_params = sdm845_snd_hw_params,
.hw_free = sdm845_snd_hw_free,
.prepare = sdm845_snd_prepare,
.startup = sdm845_snd_startup, .startup = sdm845_snd_startup,
.shutdown = sdm845_snd_shutdown, .shutdown = sdm845_snd_shutdown,
}; };