microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Acked-by: Kenneth Westfield <kwestfie@codeaurora.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Srinivas Kandagatla 2016-02-11 12:17:30 +00:00 коммит произвёл Mark Brown
Родитель ffc1325e1d
Коммит ec5b82878c
3 изменённых файлов: 4 добавлений и 4 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
sound/soc/qcom/lpass-apq8016.c
Просмотреть файл

@ -212,7 +212,7 @@ static struct lpass_variant apq8016_data = {
.rdma_reg_base = 0x8400, .rdma_reg_base = 0x8400,
.rdma_reg_stride = 0x1000, .rdma_reg_stride = 0x1000,
.rdma_channels = 2, .rdma_channels = 2,
.rdmactl_audif_start = 1, .dmactl_audif_start = 1,
.dai_driver = apq8016_lpass_cpu_dai_driver, .dai_driver = apq8016_lpass_cpu_dai_driver,
.num_dai = ARRAY_SIZE(apq8016_lpass_cpu_dai_driver), .num_dai = ARRAY_SIZE(apq8016_lpass_cpu_dai_driver),
.init = apq8016_lpass_init, .init = apq8016_lpass_init,

4
sound/soc/qcom/lpass-platform.c
Просмотреть файл

@ -91,7 +91,7 @@ static int lpass_platform_pcmops_hw_params(struct snd_pcm_substream *substream,
unsigned int channels = params_channels(params); unsigned int channels = params_channels(params);
unsigned int regval; unsigned int regval;
int bitwidth; 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); bitwidth = snd_pcm_format_width(format);
if (bitwidth < 0) { if (bitwidth < 0) {
@ -101,7 +101,7 @@ static int lpass_platform_pcmops_hw_params(struct snd_pcm_substream *substream,
} }
regval = LPAIF_RDMACTL_BURSTEN_INCR4 | regval = LPAIF_RDMACTL_BURSTEN_INCR4 |
LPAIF_RDMACTL_AUDINTF(rdma_port) | LPAIF_RDMACTL_AUDINTF(dma_port) |
LPAIF_RDMACTL_FIFOWM_8; LPAIF_RDMACTL_FIFOWM_8;
switch (bitwidth) { switch (bitwidth) {

2
sound/soc/qcom/lpass.h
Просмотреть файл

@ -79,7 +79,7 @@ struct lpass_variant {
* on SOCs like APQ8016 the channel control bits start * on SOCs like APQ8016 the channel control bits start
* at different offset to ipq806x * at different offset to ipq806x
**/ **/
u32 rdmactl_audif_start; u32 dmactl_audif_start;
u32 wrdma_channel_start; u32 wrdma_channel_start;
/* SOC specific intialization like clocks */ /* SOC specific intialization like clocks */
int (*init)(struct platform_device *pdev); int (*init)(struct platform_device *pdev);