From: Jeffy Chen <jeffy.chen@rock-chips.com>
To: linux-kernel@vger.kernel.org, dgreid@chromium.org, heiko@sntech.de
Cc: briannorris@chromium.org, mka@chromium.org,
dianders@chromium.org, Jeffy Chen <jeffy.chen@rock-chips.com>,
Jaroslav Kysela <perex@perex.cz>,
alsa-devel@alsa-project.org, linux-rockchip@lists.infradead.org,
Mark Brown <broonie@kernel.org>, Takashi Iwai <tiwai@suse.com>,
Liam Girdwood <lgirdwood@gmail.com>,
linux-arm-kernel@lists.infradead.org
Subject: [RESENT PATCH v7 6/7] ASoC: rockchip: Add support for DMIC codec
Date: Thu, 24 Aug 2017 12:52:26 +0800 [thread overview]
Message-ID: <20170824045227.15504-7-jeffy.chen@rock-chips.com> (raw)
In-Reply-To: <20170824045227.15504-1-jeffy.chen@rock-chips.com>
Add support for optional dmic codec.
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---
Changes in v7: None
Changes in v6:
Add dmic wakeup delay(not used for now).
Changes in v3: None
Changes in v2: None
sound/soc/rockchip/Kconfig | 1 +
sound/soc/rockchip/rk3399_gru_sound.c | 36 +++++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+)
diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig
index 8f0d0d8d34e6..b0825370d262 100644
--- a/sound/soc/rockchip/Kconfig
+++ b/sound/soc/rockchip/Kconfig
@@ -69,6 +69,7 @@ config SND_SOC_RK3399_GRU_SOUND
select SND_SOC_DA7219
select SND_SOC_RT5514_SPI
select SND_SOC_HDMI_CODEC
+ select SND_SOC_DMIC
help
Say Y or M here if you want to add support multiple codecs for SoC
audio on Rockchip RK3399 GRU boards.
diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c
index 91aab5c18f3b..5ab25962cabd 100644
--- a/sound/soc/rockchip/rk3399_gru_sound.c
+++ b/sound/soc/rockchip/rk3399_gru_sound.c
@@ -267,6 +267,28 @@ static int rockchip_sound_cdndp_hw_params(struct snd_pcm_substream *substream,
return 0;
}
+static int rockchip_sound_dmic_hw_params(struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *params)
+{
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
+ unsigned int mclk;
+ int ret;
+
+ mclk = params_rate(params) * SOUND_FS;
+
+ ret = snd_soc_dai_set_sysclk(rtd->cpu_dai, 0, mclk, 0);
+ if (ret) {
+ dev_err(rtd->card->dev, "%s() error setting sysclk to %u: %d\n",
+ __func__, mclk, ret);
+ return ret;
+ }
+
+ /* Wait for DMIC stable */
+ msleep(dmic_wakeup_delay);
+
+ return 0;
+}
+
static const struct snd_soc_ops rockchip_sound_max98357a_ops = {
.hw_params = rockchip_sound_max98357a_hw_params,
};
@@ -283,6 +305,10 @@ static struct snd_soc_ops rockchip_sound_cdndp_ops = {
.hw_params = rockchip_sound_cdndp_hw_params,
};
+static struct snd_soc_ops rockchip_sound_dmic_ops = {
+ .hw_params = rockchip_sound_dmic_hw_params,
+};
+
static struct snd_soc_card rockchip_sound_card = {
.name = "rk3399-gru-sound",
.owner = THIS_MODULE,
@@ -297,6 +323,7 @@ static struct snd_soc_card rockchip_sound_card = {
enum {
DAILINK_CDNDP,
DAILINK_DA7219,
+ DAILINK_DMIC,
DAILINK_MAX98357A,
DAILINK_RT5514,
DAILINK_RT5514_DSP,
@@ -305,6 +332,7 @@ enum {
static const char * const dailink_compat[] = {
[DAILINK_CDNDP] = "rockchip,rk3399-cdn-dp",
[DAILINK_DA7219] = "dlg,da7219",
+ [DAILINK_DMIC] = "dmic-codec",
[DAILINK_MAX98357A] = "maxim,max98357a",
[DAILINK_RT5514] = "realtek,rt5514-i2c",
[DAILINK_RT5514_DSP] = "realtek,rt5514-spi",
@@ -329,6 +357,14 @@ static const struct snd_soc_dai_link rockchip_dais[] = {
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS,
},
+ [DAILINK_DMIC] = {
+ .name = "DMIC",
+ .stream_name = "DMIC PCM",
+ .codec_dai_name = "dmic-hifi",
+ .ops = &rockchip_sound_dmic_ops,
+ .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
+ SND_SOC_DAIFMT_CBS_CFS,
+ },
[DAILINK_MAX98357A] = {
.name = "MAX98357A",
.stream_name = "MAX98357A PCM",
--
2.11.0
next prev parent reply other threads:[~2017-08-24 4:53 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-24 4:52 [RESENT PATCH v7 0/7] ASoC: rockchip: Parse dai links from dts Jeffy Chen
2017-08-24 4:52 ` [RESENT PATCH v7 1/7] ASoC: rockchip: Use codec of_node and dai_name for rt5514 dsp Jeffy Chen
2017-08-24 21:19 ` Matthias Kaehlcke
2017-08-29 19:29 ` Applied "ASoC: rockchip: Use codec of_node and dai_name for rt5514 dsp" to the asoc tree Mark Brown
2017-08-24 4:52 ` [RESENT PATCH v7 2/7] arm64: dts: rockchip: Add rt5514 dsp for Gru Jeffy Chen
2017-09-09 11:13 ` Heiko Stuebner
2017-09-09 11:45 ` Heiko Stuebner
2017-08-24 4:52 ` [RESENT PATCH v7 3/7] arm64: dts: rockchip: Update rt5514 devices' compatible " Jeffy Chen
2017-08-30 13:30 ` Heiko Stübner
2017-08-30 17:00 ` jeffy
2017-09-04 22:33 ` Heiko Stübner
2017-09-05 4:26 ` jeffy
2017-08-24 4:52 ` [RESENT PATCH v7 4/7] ASoC: rockchip: Parse dai links from dts Jeffy Chen
2017-08-29 19:28 ` Applied "ASoC: rockchip: Parse dai links from dts" to the asoc tree Mark Brown
2017-08-24 4:52 ` [RESENT PATCH v7 5/7] ASoC: rockchip: Add support for DP codec Jeffy Chen
2017-08-24 4:52 ` Jeffy Chen [this message]
2017-08-24 4:52 ` [RESENT PATCH v7 7/7] dt-bindings: ASoC: rockchip: Update description of rockchip,codec Jeffy Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170824045227.15504-7-jeffy.chen@rock-chips.com \
--to=jeffy.chen@rock-chips.com \
--cc=alsa-devel@alsa-project.org \
--cc=briannorris@chromium.org \
--cc=broonie@kernel.org \
--cc=dgreid@chromium.org \
--cc=dianders@chromium.org \
--cc=heiko@sntech.de \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mka@chromium.org \
--cc=perex@perex.cz \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome