[][Add mt79xx audio platform and machine driver]
[Description]
Add mt79xx audio platform and machine driver with wm8960 and si3218x
Patch reference: https://lore.kernel.org/alsa-devel/1573814926-15805-2-git-send-email-eason.yen@mediatek.com/T/
[Release-log]
N/A
Change-Id: I316c562e20d118899a38206cc1fd4c6e14bffdbd
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/5397355
diff --git a/target/linux/mediatek/patches-5.4/0400-sound-add-some-helpers-to-control-mtk_memif.patch b/target/linux/mediatek/patches-5.4/0400-sound-add-some-helpers-to-control-mtk_memif.patch
new file mode 100644
index 0000000..ddeb5a4
--- /dev/null
+++ b/target/linux/mediatek/patches-5.4/0400-sound-add-some-helpers-to-control-mtk_memif.patch
@@ -0,0 +1,313 @@
+--- a/sound/soc/mediatek/common/mtk-afe-fe-dai.c
++++ b/sound/soc/mediatek/common/mtk-afe-fe-dai.c
+@@ -361,6 +361,222 @@
+ }
+ EXPORT_SYMBOL_GPL(mtk_afe_dai_resume);
+
++int mtk_memif_set_enable(struct mtk_base_afe *afe, int id)
++{
++ struct mtk_base_afe_memif *memif = &afe->memif[id];
++
++ if (memif->data->enable_shift < 0) {
++ dev_warn(afe->dev, "%s(), error, id %d, enable_shift < 0\n",
++ __func__, id);
++ return 0;
++ }
++ return mtk_regmap_update_bits(afe->regmap, memif->data->enable_reg,
++ 1, 1, memif->data->enable_shift);
++}
++EXPORT_SYMBOL_GPL(mtk_memif_set_enable);
++
++int mtk_memif_set_disable(struct mtk_base_afe *afe, int id)
++{
++ struct mtk_base_afe_memif *memif = &afe->memif[id];
++
++ if (memif->data->enable_shift < 0) {
++ dev_warn(afe->dev, "%s(), error, id %d, enable_shift < 0\n",
++ __func__, id);
++ return 0;
++ }
++ return mtk_regmap_update_bits(afe->regmap, memif->data->enable_reg,
++ 1, 0, memif->data->enable_shift);
++}
++EXPORT_SYMBOL_GPL(mtk_memif_set_disable);
++
++int mtk_memif_set_addr(struct mtk_base_afe *afe, int id,
++ unsigned char *dma_area,
++ dma_addr_t dma_addr,
++ size_t dma_bytes)
++{
++ struct mtk_base_afe_memif *memif = &afe->memif[id];
++ int msb_at_bit33 = upper_32_bits(dma_addr) ? 1 : 0;
++ unsigned int phys_buf_addr = lower_32_bits(dma_addr);
++ unsigned int phys_buf_addr_upper_32 = upper_32_bits(dma_addr);
++
++ memif->dma_area = dma_area;
++ memif->dma_addr = dma_addr;
++ memif->dma_bytes = dma_bytes;
++
++ /* start */
++ mtk_regmap_write(afe->regmap, memif->data->reg_ofs_base,
++ phys_buf_addr);
++ /* end */
++ if (memif->data->reg_ofs_end)
++ mtk_regmap_write(afe->regmap,
++ memif->data->reg_ofs_end,
++ phys_buf_addr + dma_bytes - 1);
++ else
++ mtk_regmap_write(afe->regmap,
++ memif->data->reg_ofs_base +
++ AFE_BASE_END_OFFSET,
++ phys_buf_addr + dma_bytes - 1);
++
++ /* set start, end, upper 32 bits */
++ if (memif->data->reg_ofs_base_msb) {
++ mtk_regmap_write(afe->regmap, memif->data->reg_ofs_base_msb,
++ phys_buf_addr_upper_32);
++ mtk_regmap_write(afe->regmap,
++ memif->data->reg_ofs_end_msb,
++ phys_buf_addr_upper_32);
++ }
++
++ /* set MSB to 33-bit */
++ if (memif->data->msb_reg >= 0)
++ mtk_regmap_update_bits(afe->regmap, memif->data->msb_reg,
++ 1, msb_at_bit33, memif->data->msb_shift);
++
++ return 0;
++}
++EXPORT_SYMBOL_GPL(mtk_memif_set_addr);
++
++int mtk_memif_set_channel(struct mtk_base_afe *afe,
++ int id, unsigned int channel)
++{
++ struct mtk_base_afe_memif *memif = &afe->memif[id];
++ unsigned int mono;
++
++ if (memif->data->mono_shift < 0)
++ return 0;
++
++ if (memif->data->quad_ch_mask) {
++ unsigned int quad_ch = (channel == 4) ? 1 : 0;
++
++ mtk_regmap_update_bits(afe->regmap, memif->data->quad_ch_reg,
++ memif->data->quad_ch_mask,
++ quad_ch, memif->data->quad_ch_shift);
++ }
++
++ if (memif->data->mono_invert)
++ mono = (channel == 1) ? 0 : 1;
++ else
++ mono = (channel == 1) ? 1 : 0;
++
++ return mtk_regmap_update_bits(afe->regmap, memif->data->mono_reg,
++ 1, mono, memif->data->mono_shift);
++}
++EXPORT_SYMBOL_GPL(mtk_memif_set_channel);
++
++static int mtk_memif_set_rate_fs(struct mtk_base_afe *afe,
++ int id, int fs)
++{
++ struct mtk_base_afe_memif *memif = &afe->memif[id];
++
++ if (memif->data->fs_shift >= 0)
++ mtk_regmap_update_bits(afe->regmap, memif->data->fs_reg,
++ memif->data->fs_maskbit,
++ fs, memif->data->fs_shift);
++
++ return 0;
++}
++
++int mtk_memif_set_rate(struct mtk_base_afe *afe,
++ int id, unsigned int rate)
++{
++ int fs = 0;
++
++ if (!afe->get_dai_fs) {
++ dev_err(afe->dev, "%s(), error, afe->get_dai_fs == NULL\n",
++ __func__);
++ return -EINVAL;
++ }
++
++ fs = afe->get_dai_fs(afe, id, rate);
++
++ if (fs < 0)
++ return -EINVAL;
++
++ return mtk_memif_set_rate_fs(afe, id, fs);
++}
++EXPORT_SYMBOL_GPL(mtk_memif_set_rate);
++
++int mtk_memif_set_rate_substream(struct snd_pcm_substream *substream,
++ int id, unsigned int rate)
++{
++ struct snd_soc_pcm_runtime *rtd = substream->private_data;
++ struct snd_soc_component *component =
++ snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME);
++ struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component);
++
++ int fs = 0;
++
++ if (!afe->memif_fs) {
++ dev_err(afe->dev, "%s(), error, afe->memif_fs == NULL\n",
++ __func__);
++ return -EINVAL;
++ }
++
++ fs = afe->memif_fs(substream, rate);
++
++ if (fs < 0)
++ return -EINVAL;
++
++ return mtk_memif_set_rate_fs(afe, id, fs);
++}
++EXPORT_SYMBOL_GPL(mtk_memif_set_rate_substream);
++
++int mtk_memif_set_format(struct mtk_base_afe *afe,
++ int id, snd_pcm_format_t format)
++{
++ struct mtk_base_afe_memif *memif = &afe->memif[id];
++ int hd_audio = 0;
++ int hd_align = 0;
++
++ /* set hd mode */
++ switch (format) {
++ case SNDRV_PCM_FORMAT_S16_LE:
++ case SNDRV_PCM_FORMAT_U16_LE:
++ hd_audio = 0;
++ break;
++ case SNDRV_PCM_FORMAT_S32_LE:
++ case SNDRV_PCM_FORMAT_U32_LE:
++ hd_audio = 1;
++ hd_align = 1;
++ break;
++ case SNDRV_PCM_FORMAT_S24_LE:
++ case SNDRV_PCM_FORMAT_U24_LE:
++ hd_audio = 1;
++ break;
++ default:
++ dev_err(afe->dev, "%s() error: unsupported format %d\n",
++ __func__, format);
++ break;
++ }
++
++ mtk_regmap_update_bits(afe->regmap, memif->data->hd_reg,
++ 1, hd_audio, memif->data->hd_shift);
++
++ mtk_regmap_update_bits(afe->regmap, memif->data->hd_align_reg,
++ 1, hd_align, memif->data->hd_align_mshift);
++
++ return 0;
++}
++EXPORT_SYMBOL_GPL(mtk_memif_set_format);
++
++int mtk_memif_set_pbuf_size(struct mtk_base_afe *afe,
++ int id, int pbuf_size)
++{
++ const struct mtk_base_memif_data *memif_data = afe->memif[id].data;
++
++ if (memif_data->pbuf_mask == 0 || memif_data->minlen_mask == 0)
++ return 0;
++
++ mtk_regmap_update_bits(afe->regmap, memif_data->pbuf_reg,
++ memif_data->pbuf_mask,
++ pbuf_size, memif_data->pbuf_shift);
++
++ mtk_regmap_update_bits(afe->regmap, memif_data->minlen_reg,
++ memif_data->minlen_mask,
++ pbuf_size, memif_data->minlen_shift);
++ return 0;
++}
++EXPORT_SYMBOL_GPL(mtk_memif_set_pbuf_size);
++
+ MODULE_DESCRIPTION("Mediatek simple fe dai operator");
+ MODULE_AUTHOR("Garlic Tseng <garlic.tseng@mediatek.com>");
+ MODULE_LICENSE("GPL v2");
+--- a/sound/soc/mediatek/common/mtk-afe-fe-dai.h
++++ b/sound/soc/mediatek/common/mtk-afe-fe-dai.h
+@@ -34,4 +34,20 @@
+ int mtk_afe_dai_suspend(struct snd_soc_dai *dai);
+ int mtk_afe_dai_resume(struct snd_soc_dai *dai);
+
++int mtk_memif_set_enable(struct mtk_base_afe *afe, int id);
++int mtk_memif_set_disable(struct mtk_base_afe *afe, int id);
++int mtk_memif_set_addr(struct mtk_base_afe *afe, int id,
++ unsigned char *dma_area,
++ dma_addr_t dma_addr,
++ size_t dma_bytes);
++int mtk_memif_set_channel(struct mtk_base_afe *afe,
++ int id, unsigned int channel);
++int mtk_memif_set_rate(struct mtk_base_afe *afe,
++ int id, unsigned int rate);
++int mtk_memif_set_rate_substream(struct snd_pcm_substream *substream,
++ int id, unsigned int rate);
++int mtk_memif_set_format(struct mtk_base_afe *afe,
++ int id, snd_pcm_format_t format);
++int mtk_memif_set_pbuf_size(struct mtk_base_afe *afe,
++ int id, int pbuf_size);
+ #endif
+--- a/sound/soc/mediatek/common/mtk-base-afe.h
++++ b/sound/soc/mediatek/common/mtk-base-afe.h
+@@ -16,21 +16,38 @@
+ const char *name;
+ int reg_ofs_base;
+ int reg_ofs_cur;
++ int reg_ofs_end;
++ int reg_ofs_base_msb;
++ int reg_ofs_cur_msb;
++ int reg_ofs_end_msb;
+ int fs_reg;
+ int fs_shift;
+ int fs_maskbit;
+ int mono_reg;
+ int mono_shift;
++ int mono_invert;
++ int quad_ch_reg;
++ int quad_ch_mask;
++ int quad_ch_shift;
+ int enable_reg;
+ int enable_shift;
+ int hd_reg;
+- int hd_align_reg;
+ int hd_shift;
++ int hd_align_reg;
+ int hd_align_mshift;
+ int msb_reg;
+ int msb_shift;
++ int msb2_reg;
++ int msb2_shift;
+ int agent_disable_reg;
+ int agent_disable_shift;
++ /* playback memif only */
++ int pbuf_reg;
++ int pbuf_mask;
++ int pbuf_shift;
++ int minlen_reg;
++ int minlen_mask;
++ int minlen_shift;
+ };
+
+ struct mtk_base_irq_data {
+@@ -84,6 +101,12 @@
+ unsigned int rate);
+ int (*irq_fs)(struct snd_pcm_substream *substream,
+ unsigned int rate);
++ int (*get_dai_fs)(struct mtk_base_afe *afe,
++ int dai_id, unsigned int rate);
++ int (*get_memif_pbuf_size)(struct snd_pcm_substream *substream);
++
++ int (*request_dram_resource)(struct device *dev);
++ int (*release_dram_resource)(struct device *dev);
+
+ void *platform_priv;
+ };
+@@ -95,6 +118,9 @@
+ const struct mtk_base_memif_data *data;
+ int irq_usage;
+ int const_irq;
++ unsigned char *dma_area;
++ dma_addr_t dma_addr;
++ size_t dma_bytes;
+ };
+
+ struct mtk_base_afe_irq {
diff --git a/target/linux/mediatek/patches-5.4/0401-sound-refine-hw-params-and-hw-prepare.patch b/target/linux/mediatek/patches-5.4/0401-sound-refine-hw-params-and-hw-prepare.patch
new file mode 100644
index 0000000..3e24d51
--- /dev/null
+++ b/target/linux/mediatek/patches-5.4/0401-sound-refine-hw-params-and-hw-prepare.patch
@@ -0,0 +1,221 @@
+--- a/sound/soc/mediatek/common/mtk-afe-fe-dai.c
++++ b/sound/soc/mediatek/common/mtk-afe-fe-dai.c
+@@ -6,11 +6,13 @@
+ * Author: Garlic Tseng <garlic.tseng@mediatek.com>
+ */
+
++#include <linux/io.h>
+ #include <linux/module.h>
+ #include <linux/pm_runtime.h>
+ #include <linux/regmap.h>
+ #include <sound/soc.h>
+ #include "mtk-afe-platform-driver.h"
++#include <sound/pcm_params.h>
+ #include "mtk-afe-fe-dai.h"
+ #include "mtk-base-afe.h"
+
+@@ -120,50 +122,64 @@
+ {
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
+ struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);
+- struct mtk_base_afe_memif *memif = &afe->memif[rtd->cpu_dai->id];
+- int msb_at_bit33 = 0;
+- int ret, fs = 0;
++ int id = rtd->cpu_dai->id;
++ struct mtk_base_afe_memif *memif = &afe->memif[id];
++ int ret;
++ unsigned int channels = params_channels(params);
++ unsigned int rate = params_rate(params);
++ snd_pcm_format_t format = params_format(params);
+
+ ret = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));
+ if (ret < 0)
+ return ret;
+
+- msb_at_bit33 = upper_32_bits(substream->runtime->dma_addr) ? 1 : 0;
+- memif->phys_buf_addr = lower_32_bits(substream->runtime->dma_addr);
+- memif->buffer_size = substream->runtime->dma_bytes;
+-
+- /* start */
+- mtk_regmap_write(afe->regmap, memif->data->reg_ofs_base,
+- memif->phys_buf_addr);
+- /* end */
+- mtk_regmap_write(afe->regmap,
+- memif->data->reg_ofs_base + AFE_BASE_END_OFFSET,
+- memif->phys_buf_addr + memif->buffer_size - 1);
+-
+- /* set MSB to 33-bit */
+- mtk_regmap_update_bits(afe->regmap, memif->data->msb_reg,
+- 1, msb_at_bit33, memif->data->msb_shift);
++ if (afe->request_dram_resource)
++ afe->request_dram_resource(afe->dev);
+
+- /* set channel */
+- if (memif->data->mono_shift >= 0) {
+- unsigned int mono = (params_channels(params) == 1) ? 1 : 0;
++ dev_dbg(afe->dev, "%s(), %s, ch %d, rate %d, fmt %d, dma_addr %pad, dma_area %p, dma_bytes 0x%zx\n",
++ __func__, memif->data->name,
++ channels, rate, format,
++ &substream->runtime->dma_addr,
++ substream->runtime->dma_area,
++ substream->runtime->dma_bytes);
++
++ memset_io(substream->runtime->dma_area, 0,
++ substream->runtime->dma_bytes);
++
++ /* set addr */
++ ret = mtk_memif_set_addr(afe, id,
++ substream->runtime->dma_area,
++ substream->runtime->dma_addr,
++ substream->runtime->dma_bytes);
++ if (ret) {
++ dev_err(afe->dev, "%s(), error, id %d, set addr, ret %d\n",
++ __func__, id, ret);
++ return ret;
++ }
+
+- mtk_regmap_update_bits(afe->regmap, memif->data->mono_reg,
+- 1, mono, memif->data->mono_shift);
++ /* set channel */
++ ret = mtk_memif_set_channel(afe, id, channels);
++ if (ret) {
++ dev_err(afe->dev, "%s(), error, id %d, set channel %d, ret %d\n",
++ __func__, id, channels, ret);
++ return ret;
+ }
+
+ /* set rate */
+- if (memif->data->fs_shift < 0)
+- return 0;
+-
+- fs = afe->memif_fs(substream, params_rate(params));
+-
+- if (fs < 0)
+- return -EINVAL;
++ ret = mtk_memif_set_rate_substream(substream, id, rate);
++ if (ret) {
++ dev_err(afe->dev, "%s(), error, id %d, set rate %d, ret %d\n",
++ __func__, id, rate, ret);
++ return ret;
++ }
+
+- mtk_regmap_update_bits(afe->regmap, memif->data->fs_reg,
+- memif->data->fs_maskbit, fs,
+- memif->data->fs_shift);
++ /* set format */
++ ret = mtk_memif_set_format(afe, id, format);
++ if (ret) {
++ dev_err(afe->dev, "%s(), error, id %d, set format %d, ret %d\n",
++ __func__, id, format, ret);
++ return ret;
++ }
+
+ return 0;
+ }
+@@ -172,6 +188,11 @@
+ int mtk_afe_fe_hw_free(struct snd_pcm_substream *substream,
+ struct snd_soc_dai *dai)
+ {
++ struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);
++
++ if (afe->release_dram_resource)
++ afe->release_dram_resource(afe->dev);
++
+ return snd_pcm_lib_free_pages(substream);
+ }
+ EXPORT_SYMBOL_GPL(mtk_afe_fe_hw_free);
+@@ -182,20 +203,25 @@
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
+ struct snd_pcm_runtime * const runtime = substream->runtime;
+ struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);
+- struct mtk_base_afe_memif *memif = &afe->memif[rtd->cpu_dai->id];
++ int id = rtd->cpu_dai->id;
++ struct mtk_base_afe_memif *memif = &afe->memif[id];
+ struct mtk_base_afe_irq *irqs = &afe->irqs[memif->irq_usage];
+ const struct mtk_base_irq_data *irq_data = irqs->irq_data;
+ unsigned int counter = runtime->period_size;
+ int fs;
++ int ret;
+
+ dev_dbg(afe->dev, "%s %s cmd=%d\n", __func__, memif->data->name, cmd);
+
+ switch (cmd) {
+ case SNDRV_PCM_TRIGGER_START:
+ case SNDRV_PCM_TRIGGER_RESUME:
+- mtk_regmap_update_bits(afe->regmap,
+- memif->data->enable_reg,
+- 1, 1, memif->data->enable_shift);
++ ret = mtk_memif_set_enable(afe, id);
++ if (ret) {
++ dev_err(afe->dev, "%s(), error, id %d, memif enable, ret %d\n",
++ __func__, id, ret);
++ return ret;
++ }
+
+ /* set irq counter */
+ mtk_regmap_update_bits(afe->regmap, irq_data->irq_cnt_reg,
+@@ -219,15 +245,19 @@
+ return 0;
+ case SNDRV_PCM_TRIGGER_STOP:
+ case SNDRV_PCM_TRIGGER_SUSPEND:
+- mtk_regmap_update_bits(afe->regmap, memif->data->enable_reg,
+- 1, 0, memif->data->enable_shift);
++ ret = mtk_memif_set_disable(afe, id);
++ if (ret) {
++ dev_err(afe->dev, "%s(), error, id %d, memif enable, ret %d\n",
++ __func__, id, ret);
++ }
++
+ /* disable interrupt */
+ mtk_regmap_update_bits(afe->regmap, irq_data->irq_en_reg,
+ 1, 0, irq_data->irq_en_shift);
+ /* and clear pending IRQ */
+ mtk_regmap_write(afe->regmap, irq_data->irq_clr_reg,
+ 1 << irq_data->irq_clr_shift);
+- return 0;
++ return ret;
+ default:
+ return -EINVAL;
+ }
+@@ -239,34 +269,15 @@
+ {
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
+ struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);
+- struct mtk_base_afe_memif *memif = &afe->memif[rtd->cpu_dai->id];
+- int hd_audio = 0;
+- int hd_align = 0;
++ int id = rtd->cpu_dai->id;
++ int pbuf_size;
+
+- /* set hd mode */
+- switch (substream->runtime->format) {
+- case SNDRV_PCM_FORMAT_S16_LE:
+- hd_audio = 0;
+- break;
+- case SNDRV_PCM_FORMAT_S32_LE:
+- hd_audio = 1;
+- hd_align = 1;
+- break;
+- case SNDRV_PCM_FORMAT_S24_LE:
+- hd_audio = 1;
+- break;
+- default:
+- dev_err(afe->dev, "%s() error: unsupported format %d\n",
+- __func__, substream->runtime->format);
+- break;
++ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
++ if (afe->get_memif_pbuf_size) {
++ pbuf_size = afe->get_memif_pbuf_size(substream);
++ mtk_memif_set_pbuf_size(afe, id, pbuf_size);
++ }
+ }
+-
+- mtk_regmap_update_bits(afe->regmap, memif->data->hd_reg,
+- 1, hd_audio, memif->data->hd_shift);
+-
+- mtk_regmap_update_bits(afe->regmap, memif->data->hd_align_reg,
+- 1, hd_align, memif->data->hd_align_mshift);
+-
+ return 0;
+ }
+ EXPORT_SYMBOL_GPL(mtk_afe_fe_prepare);
diff --git a/target/linux/mediatek/patches-5.4/0402-sound-add-mt7986-driver-and-slic-driver.patch b/target/linux/mediatek/patches-5.4/0402-sound-add-mt7986-driver-and-slic-driver.patch
new file mode 100644
index 0000000..ee5ea6f
--- /dev/null
+++ b/target/linux/mediatek/patches-5.4/0402-sound-add-mt7986-driver-and-slic-driver.patch
@@ -0,0 +1,91 @@
+--- a/sound/soc/codecs/Kconfig
++++ b/sound/soc/codecs/Kconfig
+@@ -164,6 +164,7 @@
+ select SND_SOC_RT5677 if I2C && SPI_MASTER
+ select SND_SOC_RT5682 if I2C
+ select SND_SOC_SGTL5000 if I2C
++ select SND_SOC_SI3218X_SPI
+ select SND_SOC_SI476X if MFD_SI476X_CORE
+ select SND_SOC_SIMPLE_AMPLIFIER
+ select SND_SOC_SIRF_AUDIO_CODEC
+@@ -1484,6 +1485,14 @@
+ config SND_SOC_NAU8825
+ tristate
+
++config SND_SOC_SI3218X
++ tristate
++
++config SND_SOC_SI3218X_SPI
++ tristate "Proslic SI3218X"
++ depends on SPI
++ select SND_SOC_SI3218X
++
+ config SND_SOC_TPA6130A2
+ tristate "Texas Instruments TPA6130A2 headphone amplifier"
+ depends on I2C
+--- a/sound/soc/codecs/Makefile
++++ b/sound/soc/codecs/Makefile
+@@ -176,6 +176,7 @@
+ snd-soc-sigmadsp-objs := sigmadsp.o
+ snd-soc-sigmadsp-i2c-objs := sigmadsp-i2c.o
+ snd-soc-sigmadsp-regmap-objs := sigmadsp-regmap.o
++snd-soc-si3218x-spi-objs := si3218x-spi.o
+ snd-soc-si476x-objs := si476x.o
+ snd-soc-sirf-audio-codec-objs := sirf-audio-codec.o
+ snd-soc-spdif-tx-objs := spdif_transmitter.o
+@@ -563,3 +564,7 @@
+ obj-$(CONFIG_SND_SOC_MAX98504) += snd-soc-max98504.o
+ obj-$(CONFIG_SND_SOC_SIMPLE_AMPLIFIER) += snd-soc-simple-amplifier.o
+ obj-$(CONFIG_SND_SOC_TPA6130A2) += snd-soc-tpa6130a2.o
++
++# Proslic si3218x
++obj-$(CONFIG_SND_SOC_SI3218X) += si3218x/
++obj-$(CONFIG_SND_SOC_SI3218X_SPI) += snd-soc-si3218x-spi.o
+--- a/sound/soc/mediatek/Kconfig
++++ b/sound/soc/mediatek/Kconfig
+@@ -53,6 +53,36 @@
+ Select Y if you have such device.
+ If unsure select "N".
+
++config SND_SOC_MT79XX
++ tristate "ASoC support for Mediatek MT79XX chip"
++ depends on ARCH_MEDIATEK
++ select SND_SOC_MEDIATEK
++ help
++ This adds ASoC platform driver support for Mediatek MT79XX chip
++ that can be used with other codecs.
++ Select Y if you have such device.
++ If unsure select "N".
++
++config SND_SOC_MT79XX_WM8960
++ tristate "ASoc Audio driver for MT79XX with WM8960 codec"
++ depends on SND_SOC_MT79XX && I2C
++ select SND_SOC_WM8960
++ help
++ This adds ASoC driver for Mediatek MT79XX boards
++ with the WM8960 codecs.
++ Select Y if you have such device.
++ If unsure select "N".
++
++config SND_SOC_MT79XX_SI3218X
++ tristate "ASoc Audio driver for MT79XX with SI3218X codec"
++ depends on SND_SOC_MT79XX && SPI
++ select SND_SOC_SI3218X_SPI
++ help
++ This adds ASoC driver for Mediatek MT79XX boards
++ with the SI3218X codecs.
++ Select Y if you have such device.
++ If unsure select "N".
++
+ config SND_SOC_MT8173
+ tristate "ASoC support for Mediatek MT8173 chip"
+ depends on ARCH_MEDIATEK
+--- a/sound/soc/mediatek/Makefile
++++ b/sound/soc/mediatek/Makefile
+@@ -2,5 +2,6 @@
+ obj-$(CONFIG_SND_SOC_MEDIATEK) += common/
+ obj-$(CONFIG_SND_SOC_MT2701) += mt2701/
+ obj-$(CONFIG_SND_SOC_MT6797) += mt6797/
++obj-$(CONFIG_SND_SOC_MT79XX) += mt79xx/
+ obj-$(CONFIG_SND_SOC_MT8173) += mt8173/
+ obj-$(CONFIG_SND_SOC_MT8183) += mt8183/