Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec5b8287 authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Mark Brown
Browse files

ASoC: qcom: rename rdmactl_audif_start to dmactrl_audif_start 



This patch renames rdmactl_audif_start to dmactrl_audif_start as this
is common for both rdma and wrdma. Without this patch the name would be
bit misleading to the readers.

Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Acked-by: default avatarKenneth Westfield <kwestfie@codeaurora.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ffc1325e

sound/soc/qcom/lpass-apq8016.c

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static struct lpass_variant apq8016_data = { 
	.rdma_reg_base		= 0x8400,

	.rdma_reg_stride	= 0x1000,

	.rdma_channels		= 2,

	.rdmactl_audif_start	= 1,

	.dmactl_audif_start	= 1,

	.dai_driver		= apq8016_lpass_cpu_dai_driver,

	.num_dai		= ARRAY_SIZE(apq8016_lpass_cpu_dai_driver),

	.init			= apq8016_lpass_init,

sound/soc/qcom/lpass-platform.c

+2 −2
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static int lpass_platform_pcmops_hw_params(struct snd_pcm_substream *substream, 
	unsigned int channels = params_channels(params);

	unsigned int regval;

	int bitwidth;

	int ret, rdma_port = pcm_data->i2s_port + v->rdmactl_audif_start;

	int ret, dma_port = pcm_data->i2s_port + v->dmactl_audif_start;



	bitwidth = snd_pcm_format_width(format);

	if (bitwidth < 0) {
@@ -101,7 +101,7 @@ static int lpass_platform_pcmops_hw_params(struct snd_pcm_substream *substream, 
	}



	regval = LPAIF_RDMACTL_BURSTEN_INCR4 |

			LPAIF_RDMACTL_AUDINTF(rdma_port) |

			LPAIF_RDMACTL_AUDINTF(dma_port) |

			LPAIF_RDMACTL_FIFOWM_8;



	switch (bitwidth) {

sound/soc/qcom/lpass.h

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ struct lpass_variant { 
	 * on SOCs like APQ8016 the channel control bits start

	 * at different offset to ipq806x

	 **/

	u32	rdmactl_audif_start;

	u32	dmactl_audif_start;

	u32	wrdma_channel_start;

	/* SOC specific intialization like clocks */

	int (*init)(struct platform_device *pdev);