Applied "ASoC: mediatek: Add mt2701-wm8960 machine driver" to the asoc tree
Subsystems (3)
Mark Brown
maintainerThe patch
ASoC: mediatek: Add mt2701-wm8960 machine driver
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
8625c1dbd87631572f8e2c05bc67736b73d6f02fMon Sep 17 00:00:00 2001
From: Ryder Lee <[email protected]>
Date: Wed, 29 Mar 2017 16:59:31 +0800
Subject: [PATCH] ASoC: mediatek: Add mt2701-wm8960 machine driver
Add wm8960 machine driver and config option for MT2701.
--- sound/soc/mediatek/Kconfig | 10 ++ sound/soc/mediatek/mt2701/Makefile | 1 + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 16 +++ sound/soc/mediatek/mt2701/mt2701-wm8960.c | 176 +++++++++++++++++++++++++++++ 4 files changed, 203 insertions(+) create mode 100644 sound/soc/mediatek/mt2701/mt2701-wm8960.c
sound/soc/mediatek/Kconfig +10 -0
@@ -22,6 +22,16 @@ config SND_SOC_MT2701_CS42448 Select Y if you have such device. If unsure select "N". +config SND_SOC_MT2701_WM8960 + tristate "ASoc Audio driver for MT2701 with WM8960 codec" + depends on SND_SOC_MT2701 + select SND_SOC_WM8960 + help + This adds ASoC driver for Mediatek MT2701 boards + with the WM8960 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
sound/soc/mediatek/mt2701/Makefile +1 -0
@@ -17,3 +17,4 @@ obj-$(CONFIG_SND_SOC_MT2701) += snd-soc-mt2701-afe.o # machine driver obj-$(CONFIG_SND_SOC_MT2701_CS42448) += mt2701-cs42448.o +obj-$(CONFIG_SND_SOC_MT2701_WM8960) += mt2701-wm8960.o
sound/soc/mediatek/mt2701/mt2701-afe-pcm.c +16 -0
@@ -604,6 +604,22 @@ static struct snd_soc_dai_ops mt2701_btmrg_ops = {static struct snd_soc_dai_driver mt2701_afe_pcm_dais[] = {/* FE DAIs: memory intefaces to CPU */ { + .name ="PCMO0" , + .id =MT2701_MEMIF_DL1 , + .suspend = mtk_afe_dai_suspend, + .resume = mtk_afe_dai_resume, + .playback = { + .stream_name ="DL1" , + .channels_min =1 , + .channels_max =2 , + .rates =SNDRV_PCM_RATE_8000_192000 , + .formats = (SNDRV_PCM_FMTBIT_S16_LE + |SNDRV_PCM_FMTBIT_S24_LE + |SNDRV_PCM_FMTBIT_S32_LE ) + }, + .ops = &mt2701_single_memif_dai_ops, + }, + { .name ="PCM_multi" , .id =MT2701_MEMIF_DLM , .suspend = mtk_afe_dai_suspend,
sound/soc/mediatek/mt2701/mt2701-wm8960.c new file +176 -0
176 lines not on this page · raw message
Signature · 1 line
2.11.0