Skip to content

Commit 9cdf85a

Browse files
Eason Yenbroonie
Eason Yen
authored and
broonie
committed
ASoC: mediatek: common: add some helpers to control mtk_memif
1. Add the following helper in mtk-afe-fe-dai to control to control mtk_memif - mtk_memif_set_enable - mtk_memif_set_disable - mtk_memif_set_addr - mtk_memif_set_channel - mtk_memif_set_rate - mtk_memif_set_rate_substream - mtk_memif_set_format - mtk_memif_set_pbuf_size 2.extend mtk_base_memif_data struct for new platform Signed-off-by: Eason Yen <eason.yen@mediatek.com> Link: https://lore.kernel.org/r/1573814926-15805-2-git-send-email-eason.yen@mediatek.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 573892b commit 9cdf85a

File tree

3 files changed

+259
-1
lines changed

3 files changed

+259
-1
lines changed

‎sound/soc/mediatek/common/mtk-afe-fe-dai.c‎

Lines changed: 216 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,222 @@ int mtk_afe_dai_resume(struct snd_soc_dai *dai)
361361
}
362362
EXPORT_SYMBOL_GPL(mtk_afe_dai_resume);
363363

364+
int mtk_memif_set_enable(struct mtk_base_afe *afe, int id)
365+
{
366+
struct mtk_base_afe_memif *memif = &afe->memif[id];
367+
368+
if (memif->data->enable_shift < 0) {
369+
dev_warn(afe->dev, "%s(), error, id %d, enable_shift < 0\n",
370+
__func__, id);
371+
return 0;
372+
}
373+
return mtk_regmap_update_bits(afe->regmap, memif->data->enable_reg,
374+
1, 1, memif->data->enable_shift);
375+
}
376+
EXPORT_SYMBOL_GPL(mtk_memif_set_enable);
377+
378+
int mtk_memif_set_disable(struct mtk_base_afe *afe, int id)
379+
{
380+
struct mtk_base_afe_memif *memif = &afe->memif[id];
381+
382+
if (memif->data->enable_shift < 0) {
383+
dev_warn(afe->dev, "%s(), error, id %d, enable_shift < 0\n",
384+
__func__, id);
385+
return 0;
386+
}
387+
return mtk_regmap_update_bits(afe->regmap, memif->data->enable_reg,
388+
1, 0, memif->data->enable_shift);
389+
}
390+
EXPORT_SYMBOL_GPL(mtk_memif_set_disable);
391+
392+
int mtk_memif_set_addr(struct mtk_base_afe *afe, int id,
393+
unsigned char *dma_area,
394+
dma_addr_t dma_addr,
395+
size_t dma_bytes)
396+
{
397+
struct mtk_base_afe_memif *memif = &afe->memif[id];
398+
int msb_at_bit33 = upper_32_bits(dma_addr) ? 1 : 0;
399+
unsigned int phys_buf_addr = lower_32_bits(dma_addr);
400+
unsigned int phys_buf_addr_upper_32 = upper_32_bits(dma_addr);
401+
402+
memif->dma_area = dma_area;
403+
memif->dma_addr = dma_addr;
404+
memif->dma_bytes = dma_bytes;
405+
406+
/* start */
407+
mtk_regmap_write(afe->regmap, memif->data->reg_ofs_base,
408+
phys_buf_addr);
409+
/* end */
410+
if (memif->data->reg_ofs_end)
411+
mtk_regmap_write(afe->regmap,
412+
memif->data->reg_ofs_end,
413+
phys_buf_addr + dma_bytes - 1);
414+
else
415+
mtk_regmap_write(afe->regmap,
416+
memif->data->reg_ofs_base +
417+
AFE_BASE_END_OFFSET,
418+
phys_buf_addr + dma_bytes - 1);
419+
420+
/* set start, end, upper 32 bits */
421+
if (memif->data->reg_ofs_base_msb) {
422+
mtk_regmap_write(afe->regmap, memif->data->reg_ofs_base_msb,
423+
phys_buf_addr_upper_32);
424+
mtk_regmap_write(afe->regmap,
425+
memif->data->reg_ofs_end_msb,
426+
phys_buf_addr_upper_32);
427+
}
428+
429+
/* set MSB to 33-bit */
430+
if (memif->data->msb_reg >= 0)
431+
mtk_regmap_update_bits(afe->regmap, memif->data->msb_reg,
432+
1, msb_at_bit33, memif->data->msb_shift);
433+
434+
return 0;
435+
}
436+
EXPORT_SYMBOL_GPL(mtk_memif_set_addr);
437+
438+
int mtk_memif_set_channel(struct mtk_base_afe *afe,
439+
int id, unsigned int channel)
440+
{
441+
struct mtk_base_afe_memif *memif = &afe->memif[id];
442+
unsigned int mono;
443+
444+
if (memif->data->mono_shift < 0)
445+
return 0;
446+
447+
if (memif->data->quad_ch_mask) {
448+
unsigned int quad_ch = (channel == 4) ? 1 : 0;
449+
450+
mtk_regmap_update_bits(afe->regmap, memif->data->quad_ch_reg,
451+
memif->data->quad_ch_mask,
452+
quad_ch, memif->data->quad_ch_shift);
453+
}
454+
455+
if (memif->data->mono_invert)
456+
mono = (channel == 1) ? 0 : 1;
457+
else
458+
mono = (channel == 1) ? 1 : 0;
459+
460+
return mtk_regmap_update_bits(afe->regmap, memif->data->mono_reg,
461+
1, mono, memif->data->mono_shift);
462+
}
463+
EXPORT_SYMBOL_GPL(mtk_memif_set_channel);
464+
465+
static int mtk_memif_set_rate_fs(struct mtk_base_afe *afe,
466+
int id, int fs)
467+
{
468+
struct mtk_base_afe_memif *memif = &afe->memif[id];
469+
470+
if (memif->data->fs_shift >= 0)
471+
mtk_regmap_update_bits(afe->regmap, memif->data->fs_reg,
472+
memif->data->fs_maskbit,
473+
fs, memif->data->fs_shift);
474+
475+
return 0;
476+
}
477+
478+
int mtk_memif_set_rate(struct mtk_base_afe *afe,
479+
int id, unsigned int rate)
480+
{
481+
int fs = 0;
482+
483+
if (!afe->get_dai_fs) {
484+
dev_err(afe->dev, "%s(), error, afe->get_dai_fs == NULL\n",
485+
__func__);
486+
return -EINVAL;
487+
}
488+
489+
fs = afe->get_dai_fs(afe, id, rate);
490+
491+
if (fs < 0)
492+
return -EINVAL;
493+
494+
return mtk_memif_set_rate_fs(afe, id, fs);
495+
}
496+
EXPORT_SYMBOL_GPL(mtk_memif_set_rate);
497+
498+
int mtk_memif_set_rate_substream(struct snd_pcm_substream *substream,
499+
int id, unsigned int rate)
500+
{
501+
struct snd_soc_pcm_runtime *rtd = substream->private_data;
502+
struct snd_soc_component *component =
503+
snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME);
504+
struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component);
505+
506+
int fs = 0;
507+
508+
if (!afe->memif_fs) {
509+
dev_err(afe->dev, "%s(), error, afe->memif_fs == NULL\n",
510+
__func__);
511+
return -EINVAL;
512+
}
513+
514+
fs = afe->memif_fs(substream, rate);
515+
516+
if (fs < 0)
517+
return -EINVAL;
518+
519+
return mtk_memif_set_rate_fs(afe, id, fs);
520+
}
521+
EXPORT_SYMBOL_GPL(mtk_memif_set_rate_substream);
522+
523+
int mtk_memif_set_format(struct mtk_base_afe *afe,
524+
int id, snd_pcm_format_t format)
525+
{
526+
struct mtk_base_afe_memif *memif = &afe->memif[id];
527+
int hd_audio = 0;
528+
int hd_align = 0;
529+
530+
/* set hd mode */
531+
switch (format) {
532+
case SNDRV_PCM_FORMAT_S16_LE:
533+
case SNDRV_PCM_FORMAT_U16_LE:
534+
hd_audio = 0;
535+
break;
536+
case SNDRV_PCM_FORMAT_S32_LE:
537+
case SNDRV_PCM_FORMAT_U32_LE:
538+
hd_audio = 1;
539+
hd_align = 1;
540+
break;
541+
case SNDRV_PCM_FORMAT_S24_LE:
542+
case SNDRV_PCM_FORMAT_U24_LE:
543+
hd_audio = 1;
544+
break;
545+
default:
546+
dev_err(afe->dev, "%s() error: unsupported format %d\n",
547+
__func__, format);
548+
break;
549+
}
550+
551+
mtk_regmap_update_bits(afe->regmap, memif->data->hd_reg,
552+
1, hd_audio, memif->data->hd_shift);
553+
554+
mtk_regmap_update_bits(afe->regmap, memif->data->hd_align_reg,
555+
1, hd_align, memif->data->hd_align_mshift);
556+
557+
return 0;
558+
}
559+
EXPORT_SYMBOL_GPL(mtk_memif_set_format);
560+
561+
int mtk_memif_set_pbuf_size(struct mtk_base_afe *afe,
562+
int id, int pbuf_size)
563+
{
564+
const struct mtk_base_memif_data *memif_data = afe->memif[id].data;
565+
566+
if (memif_data->pbuf_mask == 0 || memif_data->minlen_mask == 0)
567+
return 0;
568+
569+
mtk_regmap_update_bits(afe->regmap, memif_data->pbuf_reg,
570+
memif_data->pbuf_mask,
571+
pbuf_size, memif_data->pbuf_shift);
572+
573+
mtk_regmap_update_bits(afe->regmap, memif_data->minlen_reg,
574+
memif_data->minlen_mask,
575+
pbuf_size, memif_data->minlen_shift);
576+
return 0;
577+
}
578+
EXPORT_SYMBOL_GPL(mtk_memif_set_pbuf_size);
579+
364580
MODULE_DESCRIPTION("Mediatek simple fe dai operator");
365581
MODULE_AUTHOR("Garlic Tseng <garlic.tseng@mediatek.com>");
366582
MODULE_LICENSE("GPL v2");

‎sound/soc/mediatek/common/mtk-afe-fe-dai.h‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,20 @@ int mtk_dynamic_irq_release(struct mtk_base_afe *afe, int irq_id);
3434
int mtk_afe_dai_suspend(struct snd_soc_dai *dai);
3535
int mtk_afe_dai_resume(struct snd_soc_dai *dai);
3636

37+
int mtk_memif_set_enable(struct mtk_base_afe *afe, int id);
38+
int mtk_memif_set_disable(struct mtk_base_afe *afe, int id);
39+
int mtk_memif_set_addr(struct mtk_base_afe *afe, int id,
40+
unsigned char *dma_area,
41+
dma_addr_t dma_addr,
42+
size_t dma_bytes);
43+
int mtk_memif_set_channel(struct mtk_base_afe *afe,
44+
int id, unsigned int channel);
45+
int mtk_memif_set_rate(struct mtk_base_afe *afe,
46+
int id, unsigned int rate);
47+
int mtk_memif_set_rate_substream(struct snd_pcm_substream *substream,
48+
int id, unsigned int rate);
49+
int mtk_memif_set_format(struct mtk_base_afe *afe,
50+
int id, snd_pcm_format_t format);
51+
int mtk_memif_set_pbuf_size(struct mtk_base_afe *afe,
52+
int id, int pbuf_size);
3753
#endif

‎sound/soc/mediatek/common/mtk-base-afe.h‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,38 @@ struct mtk_base_memif_data {
1616
const char *name;
1717
int reg_ofs_base;
1818
int reg_ofs_cur;
19+
int reg_ofs_end;
20+
int reg_ofs_base_msb;
21+
int reg_ofs_cur_msb;
22+
int reg_ofs_end_msb;
1923
int fs_reg;
2024
int fs_shift;
2125
int fs_maskbit;
2226
int mono_reg;
2327
int mono_shift;
28+
int mono_invert;
29+
int quad_ch_reg;
30+
int quad_ch_mask;
31+
int quad_ch_shift;
2432
int enable_reg;
2533
int enable_shift;
2634
int hd_reg;
27-
int hd_align_reg;
2835
int hd_shift;
36+
int hd_align_reg;
2937
int hd_align_mshift;
3038
int msb_reg;
3139
int msb_shift;
40+
int msb2_reg;
41+
int msb2_shift;
3242
int agent_disable_reg;
3343
int agent_disable_shift;
44+
/* playback memif only */
45+
int pbuf_reg;
46+
int pbuf_mask;
47+
int pbuf_shift;
48+
int minlen_reg;
49+
int minlen_mask;
50+
int minlen_shift;
3451
};
3552

3653
struct mtk_base_irq_data {
@@ -84,6 +101,12 @@ struct mtk_base_afe {
84101
unsigned int rate);
85102
int (*irq_fs)(struct snd_pcm_substream *substream,
86103
unsigned int rate);
104+
int (*get_dai_fs)(struct mtk_base_afe *afe,
105+
int dai_id, unsigned int rate);
106+
int (*get_memif_pbuf_size)(struct snd_pcm_substream *substream);
107+
108+
int (*request_dram_resource)(struct device *dev);
109+
int (*release_dram_resource)(struct device *dev);
87110

88111
void *platform_priv;
89112
};
@@ -95,6 +118,9 @@ struct mtk_base_afe_memif {
95118
const struct mtk_base_memif_data *data;
96119
int irq_usage;
97120
int const_irq;
121+
unsigned char *dma_area;
122+
dma_addr_t dma_addr;
123+
size_t dma_bytes;
98124
};
99125

100126
struct mtk_base_afe_irq {

0 commit comments

Comments
 (0)