Unverified Commit 1148e16b authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: qcom: Update to use set_fmt_new callback 



As part of updating the core to directly tell drivers if they are clock
provider or consumer update these CPU side drivers to use the new direct
callback.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220519154318.2153729-18-ckeepax@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 84c5b47c

sound/soc/qcom/apq8016_sbc.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static int msm8916_qdsp6_dai_init(struct snd_soc_pcm_runtime *rtd) 
{

	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);



	snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_CBS_CFS);

	snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_BP_FP);

	return apq8016_dai_init(rtd, qdsp6_dai_get_lpass_id(cpu_dai));

}

sound/soc/qcom/qdsp6/audioreach.c

+2 −2
Original line number Diff line number Diff line
@@ -732,10 +732,10 @@ static int audioreach_i2s_set_media_format(struct q6apm_graph *graph, 
	intf_cfg->cfg.sd_line_idx = module->sd_line_idx;



	switch (cfg->fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {

	case SND_SOC_DAIFMT_CBC_CFC:

	case SND_SOC_DAIFMT_BP_FP:

		intf_cfg->cfg.ws_src = CONFIG_I2S_WS_SRC_INTERNAL;

		break;

	case SND_SOC_DAIFMT_CBP_CFP:

	case SND_SOC_DAIFMT_BC_FC:

		/* CPU is slave */

		intf_cfg->cfg.ws_src = CONFIG_I2S_WS_SRC_EXTERNAL;

		break;

sound/soc/qcom/qdsp6/q6afe-dai.c

+1 −1
Original line number Diff line number Diff line
@@ -648,7 +648,7 @@ static const struct snd_soc_dai_ops q6hdmi_ops = { 
static const struct snd_soc_dai_ops q6i2s_ops = {

	.prepare	= q6afe_dai_prepare,

	.hw_params	= q6i2s_hw_params,

	.set_fmt	= q6i2s_set_fmt,

	.set_fmt_new	= q6i2s_set_fmt,

	.shutdown	= q6afe_dai_shutdown,

	.set_sysclk	= q6afe_mi2s_set_sysclk,

};

sound/soc/qcom/qdsp6/q6afe.c

+3 −3
Original line number Diff line number Diff line
@@ -1328,11 +1328,11 @@ int q6afe_i2s_port_prepare(struct q6afe_port *port, struct q6afe_i2s_cfg *cfg) 
	pcfg->i2s_cfg.bit_width = cfg->bit_width;

	pcfg->i2s_cfg.data_format = AFE_LINEAR_PCM_DATA;



	switch (cfg->fmt & SND_SOC_DAIFMT_MASTER_MASK) {

	case SND_SOC_DAIFMT_CBS_CFS:

	switch (cfg->fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {

	case SND_SOC_DAIFMT_BP_FP:

		pcfg->i2s_cfg.ws_src = AFE_PORT_CONFIG_I2S_WS_SRC_INTERNAL;

		break;

	case SND_SOC_DAIFMT_CBM_CFM:

	case SND_SOC_DAIFMT_BC_FC:

		/* CPU is slave */

		pcfg->i2s_cfg.ws_src = AFE_PORT_CONFIG_I2S_WS_SRC_EXTERNAL;

		break;

sound/soc/qcom/qdsp6/q6apm-lpass-dais.c

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static const struct snd_soc_dai_ops q6i2s_ops = { 
	.shutdown	= q6apm_lpass_dai_shutdown,

	.set_channel_map  = q6dma_set_channel_map,

	.hw_params        = q6dma_hw_params,

	.set_fmt	= q6i2s_set_fmt,

	.set_fmt_new	= q6i2s_set_fmt,

};



static const struct snd_soc_component_driver q6apm_lpass_dai_component = {