From: Adam Serbinski <adam@serbinski.com>
To: Mark Brown <broonie@kernel.org>,
Srini Kandagatla <srinivas.kandagatla@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Adam Serbinski <adam@serbinski.com>,
Andy Gross <agross@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Patrick Lai <plai@codeaurora.org>,
Banajit Goswami <bgoswami@codeaurora.org>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
alsa-devel@alsa-project.org, linux-arm-msm@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 8/8] ASoC: qcom: apq8096: add kcontrols to set PCM rate
Date: Sun, 9 Feb 2020 10:47:48 -0500 [thread overview]
Message-ID: <20200209154748.3015-9-adam@serbinski.com> (raw)
In-Reply-To: <20200209154748.3015-1-adam@serbinski.com>
This makes it possible for the backend sample rate to be
set to 8000 or 16000 Hz, depending on the needs of the HFP
call being set up.
Signed-off-by: Adam Serbinski <adam@serbinski.com>
CC: Andy Gross <agross@kernel.org>
CC: Mark Rutland <mark.rutland@arm.com>
CC: Liam Girdwood <lgirdwood@gmail.com>
CC: Patrick Lai <plai@codeaurora.org>
CC: Banajit Goswami <bgoswami@codeaurora.org>
CC: Jaroslav Kysela <perex@perex.cz>
CC: Takashi Iwai <tiwai@suse.com>
CC: alsa-devel@alsa-project.org
CC: linux-arm-msm@vger.kernel.org
CC: devicetree@vger.kernel.org
CC: linux-kernel@vger.kernel.org
---
sound/soc/qcom/apq8096.c | 92 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 90 insertions(+), 2 deletions(-)
diff --git a/sound/soc/qcom/apq8096.c b/sound/soc/qcom/apq8096.c
index 1edcaa15234f..882f2c456321 100644
--- a/sound/soc/qcom/apq8096.c
+++ b/sound/soc/qcom/apq8096.c
@@ -16,6 +16,9 @@
#define MI2S_BCLK_RATE 1536000
#define PCM_BCLK_RATE 1024000
+static int pri_pcm_sample_rate = 16000;
+static int quat_pcm_sample_rate = 16000;
+
static int msm_snd_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params)
{
@@ -33,10 +36,15 @@ static int msm_snd_hw_params(struct snd_pcm_substream *substream,
switch (cpu_dai->id) {
case PRIMARY_PCM_RX:
case PRIMARY_PCM_TX:
+ rate->min = pri_pcm_sample_rate;
+ rate->max = pri_pcm_sample_rate;
+ channels->min = 1;
+ channels->max = 1;
+ break;
case QUATERNARY_PCM_RX:
case QUATERNARY_PCM_TX:
- rate->min = 16000;
- rate->max = 16000;
+ rate->min = quat_pcm_sample_rate;
+ rate->max = quat_pcm_sample_rate;
channels->min = 1;
channels->max = 1;
break;
@@ -121,6 +129,83 @@ static struct snd_soc_ops apq8096_ops = {
.startup = msm_snd_startup,
};
+static char const *pcm_sample_rate_text[] = {"8 kHz", "16 kHz"};
+static const struct soc_enum pcm_snd_enum =
+ SOC_ENUM_SINGLE_EXT(2, pcm_sample_rate_text);
+
+static int get_sample_rate_idx(int sample_rate)
+{
+ int sample_rate_idx = 0;
+
+ switch (sample_rate) {
+ case 8000:
+ sample_rate_idx = 0;
+ break;
+ case 16000:
+ default:
+ sample_rate_idx = 1;
+ break;
+ }
+
+ return sample_rate_idx;
+}
+
+static int pri_pcm_sample_rate_get(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ ucontrol->value.integer.value[0] =
+ get_sample_rate_idx(pri_pcm_sample_rate);
+ return 0;
+}
+
+static int quat_pcm_sample_rate_get(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ ucontrol->value.integer.value[0] =
+ get_sample_rate_idx(quat_pcm_sample_rate);
+ return 0;
+}
+
+static int get_sample_rate(int idx)
+{
+ int sample_rate_val = 0;
+
+ switch (idx) {
+ case 0:
+ sample_rate_val = 8000;
+ break;
+ case 1:
+ default:
+ sample_rate_val = 16000;
+ break;
+ }
+
+ return sample_rate_val;
+}
+
+static int pri_pcm_sample_rate_put(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ pri_pcm_sample_rate =
+ get_sample_rate(ucontrol->value.integer.value[0]);
+ return 0;
+}
+
+static int quat_pcm_sample_rate_put(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ quat_pcm_sample_rate =
+ get_sample_rate(ucontrol->value.integer.value[0]);
+ return 0;
+}
+
+static const struct snd_kcontrol_new card_controls[] = {
+ SOC_ENUM_EXT("PRI_PCM SampleRate", pcm_snd_enum,
+ pri_pcm_sample_rate_get, pri_pcm_sample_rate_put),
+ SOC_ENUM_EXT("QUAT_PCM SampleRate", pcm_snd_enum,
+ quat_pcm_sample_rate_get, quat_pcm_sample_rate_put),
+};
+
static int apq8096_init(struct snd_soc_pcm_runtime *rtd)
{
struct snd_soc_dai *codec_dai = rtd->codec_dai;
@@ -182,6 +267,9 @@ static int apq8096_platform_probe(struct platform_device *pdev)
if (ret)
goto err_card_register;
+ snd_soc_add_card_controls(card, card_controls,
+ ARRAY_SIZE(card_controls));
+
return 0;
err_card_register:
--
2.21.1
next prev parent reply other threads:[~2020-02-09 15:48 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-07 20:50 [PATCH 0/8] ASoC: qdsp6: db820c: Add support for external and bluetooth audio Adam Serbinski
2020-02-07 20:50 ` [PATCH 1/8] ASoC: qdsp6: dt-bindings: Add q6afe pcm dt binding Adam Serbinski
2020-02-07 20:50 ` [PATCH 2/8] ASoC: qdsp6: q6afe: add support to pcm ports Adam Serbinski
2020-02-07 20:50 ` [PATCH 3/8] ASoC: qdsp6: q6afe-dai: add support to pcm port dais Adam Serbinski
2020-02-07 20:50 ` [PATCH 4/8] ASoC: qdsp6: q6routing: add pcm port routing Adam Serbinski
2020-02-07 20:50 ` [PATCH 5/8] ASoC: qcom: apq8096: add support for primary and quaternary I2S/PCM Adam Serbinski
2020-02-07 20:50 ` [PATCH 6/8] ASoC: qcom/common: Use snd-soc-dummy-dai when codec is not specified Adam Serbinski
2020-02-07 20:50 ` [PATCH 7/8] dts: msm8996/db820c: enable primary pcm and quaternary i2s Adam Serbinski
2020-02-08 23:42 ` Bjorn Andersson
2020-02-07 20:50 ` [PATCH 8/8] ASoC: qcom: apq8096: add kcontrols to set PCM rate Adam Serbinski
2020-02-09 15:47 ` [PATCH v2 0/8] ASoC: qdsp6: db820c: Add support for external and bluetooth audio Adam Serbinski
2020-02-09 15:47 ` [PATCH v2 1/8] ASoC: qdsp6: dt-bindings: Add q6afe pcm dt binding Adam Serbinski
2020-02-10 17:13 ` Srinivas Kandagatla
2020-02-09 15:47 ` [PATCH v2 2/8] ASoC: qdsp6: q6afe: add support to pcm ports Adam Serbinski
2020-02-10 13:31 ` Mark Brown
2020-02-10 14:50 ` Adam Serbinski
2020-02-10 17:13 ` Srinivas Kandagatla
2020-02-09 15:47 ` [PATCH v2 3/8] ASoC: qdsp6: q6afe-dai: add support to pcm port dais Adam Serbinski
2020-02-10 13:34 ` Mark Brown
2020-02-10 17:13 ` Srinivas Kandagatla
2020-02-10 17:22 ` Adam Serbinski
2020-02-10 17:40 ` Srinivas Kandagatla
2020-02-09 15:47 ` [PATCH v2 4/8] ASoC: qdsp6: q6routing: add pcm port routing Adam Serbinski
2020-02-10 17:19 ` Srinivas Kandagatla
2020-02-09 15:47 ` [PATCH v2 5/8] ASoC: qcom: apq8096: add support for primary and quaternary I2S/PCM Adam Serbinski
2020-02-09 15:47 ` [PATCH v2 6/8] ASoC: qcom/common: Use snd-soc-dummy-dai when codec is not specified Adam Serbinski
2020-02-10 13:35 ` Mark Brown
2020-02-09 15:47 ` [PATCH v2 7/8] arm64: dts: qcom: db820c: Enable primary PCM and quaternary I2S Adam Serbinski
2020-02-09 15:47 ` Adam Serbinski [this message]
2020-02-10 13:36 ` [PATCH v2 8/8] ASoC: qcom: apq8096: add kcontrols to set PCM rate Mark Brown
2020-02-10 15:45 ` Adam Serbinski
2020-02-10 18:26 ` Mark Brown
2020-02-10 20:00 ` Adam Serbinski
2020-02-10 20:08 ` Mark Brown
2020-02-10 21:13 ` Adam Serbinski
2020-02-11 11:42 ` Mark Brown
2020-02-11 13:52 ` Adam Serbinski
2020-02-10 16:18 ` Jaroslav Kysela
2020-02-10 17:13 ` Adam Serbinski
2020-02-10 12:17 ` [PATCH v2 0/8] ASoC: qdsp6: db820c: Add support for external and bluetooth audio Mark Brown
2020-02-10 13:44 ` Adam Serbinski
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=20200209154748.3015-9-adam@serbinski.com \
--to=adam@serbinski.com \
--cc=agross@kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=bgoswami@codeaurora.org \
--cc=bjorn.andersson@linaro.org \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=perex@perex.cz \
--cc=plai@codeaurora.org \
--cc=robh+dt@kernel.org \
--cc=srinivas.kandagatla@linaro.org \
--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;
as well as URLs for NNTP newsgroup(s).