Skip to content

Commit 9e7bc5c

Browse files
wensbroonie
authored andcommitted
ASoC: mediatek: mt8183-afe-pcm: Support >32 bit DMA addresses
The AFE DMA hardware supports up to 34 bits for DMA addresses. This is missing from the driver and prevents reserved memory regions from working properly when the allocated region is above the 4GB line. Fill in the related register offsets for each DAI, and also set the DMA mask. Also fill in the LSB end register offsets for completeness. Fixes: a94aec0 ("ASoC: mediatek: mt8183: add platform driver") Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Signed-off-by: Chen-Yu Tsai <wenst@chromium.org> Link: https://patch.msgid.link/20250612074901.4023253-8-wenst@chromium.org Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent ec4a10c commit 9e7bc5c

1 file changed

Lines changed: 14 additions & 0 deletions

File tree

sound/soc/mediatek/mt8183/mt8183-afe-pcm.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
// Author: KaiChieh Chuang <kaichieh.chuang@mediatek.com>
77

88
#include <linux/delay.h>
9+
#include <linux/dma-mapping.h>
910
#include <linux/module.h>
1011
#include <linux/mfd/syscon.h>
1112
#include <linux/of.h>
@@ -432,6 +433,9 @@ static const struct snd_soc_component_driver mt8183_afe_pcm_dai_component = {
432433
.reg_ofs_base = AFE_##_id##_BASE, \
433434
.reg_ofs_cur = AFE_##_id##_CUR, \
434435
.reg_ofs_end = AFE_##_id##_END, \
436+
.reg_ofs_base_msb = AFE_##_id##_BASE_MSB, \
437+
.reg_ofs_cur_msb = AFE_##_id##_CUR_MSB, \
438+
.reg_ofs_end_msb = AFE_##_id##_END_MSB, \
435439
.fs_reg = (_fs_reg), \
436440
.fs_shift = _id##_MODE_SFT, \
437441
.fs_maskbit = _id##_MODE_MASK, \
@@ -463,11 +467,17 @@ static const struct snd_soc_component_driver mt8183_afe_pcm_dai_component = {
463467
#define AFE_VUL12_BASE AFE_VUL_D2_BASE
464468
#define AFE_VUL12_CUR AFE_VUL_D2_CUR
465469
#define AFE_VUL12_END AFE_VUL_D2_END
470+
#define AFE_VUL12_BASE_MSB AFE_VUL_D2_BASE_MSB
471+
#define AFE_VUL12_CUR_MSB AFE_VUL_D2_CUR_MSB
472+
#define AFE_VUL12_END_MSB AFE_VUL_D2_END_MSB
466473
#define AWB2_HD_ALIGN_SFT AWB2_ALIGN_SFT
467474
#define VUL12_DATA_SFT VUL12_MONO_SFT
468475
#define AFE_HDMI_BASE AFE_HDMI_OUT_BASE
469476
#define AFE_HDMI_CUR AFE_HDMI_OUT_CUR
470477
#define AFE_HDMI_END AFE_HDMI_OUT_END
478+
#define AFE_HDMI_BASE_MSB AFE_HDMI_OUT_BASE_MSB
479+
#define AFE_HDMI_CUR_MSB AFE_HDMI_OUT_CUR_MSB
480+
#define AFE_HDMI_END_MSB AFE_HDMI_OUT_END_MSB
471481

472482
static const struct mtk_base_memif_data memif_data[MT8183_MEMIF_NUM] = {
473483
MT8183_MEMIF(DL1, AFE_DAC_CON1, AFE_DAC_CON1),
@@ -764,6 +774,10 @@ static int mt8183_afe_pcm_dev_probe(struct platform_device *pdev)
764774
struct reset_control *rstc;
765775
int i, irq_id, ret;
766776

777+
ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(34));
778+
if (ret)
779+
return ret;
780+
767781
afe = devm_kzalloc(&pdev->dev, sizeof(*afe), GFP_KERNEL);
768782
if (!afe)
769783
return -ENOMEM;

0 commit comments

Comments
 (0)