From: Adam Skladowski <a39.skl@gmail.com>
Cc: phone-devel@vger.kernel.org,
~postmarketos/upstreaming@lists.sr.ht,
Adam Skladowski <a39.skl@gmail.com>,
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
Banajit Goswami <bgoswami@quicinc.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
linux-arm-msm@vger.kernel.org, alsa-devel@alsa-project.org,
linux-sound@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
Vladimir Lypak <vladimir.lypak@gmail.com>
Subject: [PATCH 1/4] ASoC: qcom: apq8016_sbc.c: Add Quinary support
Date: Mon, 22 Jul 2024 11:51:05 +0200 [thread overview]
Message-ID: <20240722095147.3372-2-a39.skl@gmail.com> (raw)
In-Reply-To: <20240722095147.3372-1-a39.skl@gmail.com>
From: Vladimir Lypak <vladimir.lypak@gmail.com>
Add support for configuring Quinary Mi2S interface
it will be used on MSM8953 and MSM8976 platform.
Signed-off-by: Vladimir Lypak <vladimir.lypak@gmail.com>
[Adam: Split from MSM8953 support patch,add msg]
Signed-off-by: Adam Skladowski <a39.skl@gmail.com>
---
sound/soc/qcom/apq8016_sbc.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/sound/soc/qcom/apq8016_sbc.c b/sound/soc/qcom/apq8016_sbc.c
index 3023cf180a75..8971f4f5d339 100644
--- a/sound/soc/qcom/apq8016_sbc.c
+++ b/sound/soc/qcom/apq8016_sbc.c
@@ -20,12 +20,13 @@
#include "common.h"
#include "qdsp6/q6afe.h"
-#define MI2S_COUNT (MI2S_QUATERNARY + 1)
+#define MI2S_COUNT (MI2S_QUINARY + 1)
struct apq8016_sbc_data {
struct snd_soc_card card;
void __iomem *mic_iomux;
void __iomem *spkr_iomux;
+ void __iomem *quin_iomux;
struct snd_soc_jack jack;
bool jack_setup;
int mi2s_clk_count[MI2S_COUNT];
@@ -86,6 +87,12 @@ static int apq8016_dai_init(struct snd_soc_pcm_runtime *rtd, int mi2s)
SPKR_CTL_TLMM_DATA1_EN | SPKR_CTL_TLMM_WS_OUT_SEL_SEC |
SPKR_CTL_TLMM_WS_EN_SEL_SEC, pdata->spkr_iomux);
break;
+ case MI2S_QUINARY:
+ /* Configure Quinary MI2S */
+ if (!pdata->quin_iomux)
+ return -ENOENT;
+ writel(readl(pdata->quin_iomux) | 0x01, pdata->quin_iomux);
+ break;
case MI2S_TERTIARY:
writel(readl(pdata->mic_iomux) | MIC_CTRL_TER_WS_SLAVE_SEL |
MIC_CTRL_TLMM_SCLK_EN,
@@ -177,6 +184,9 @@ static int qdsp6_dai_get_lpass_id(struct snd_soc_dai *cpu_dai)
case QUATERNARY_MI2S_RX:
case QUATERNARY_MI2S_TX:
return MI2S_QUATERNARY;
+ case QUINARY_MI2S_RX:
+ case QUINARY_MI2S_TX:
+ return MI2S_QUINARY;
default:
return -EINVAL;
}
@@ -320,6 +330,10 @@ static int apq8016_sbc_platform_probe(struct platform_device *pdev)
if (IS_ERR(data->spkr_iomux))
return PTR_ERR(data->spkr_iomux);
+ data->quin_iomux = devm_platform_ioremap_resource_byname(pdev, "quin-iomux");
+ if (IS_ERR(data->quin_iomux))
+ return PTR_ERR(data->quin_iomux);
+
snd_soc_card_set_drvdata(card, data);
add_ops(card);
--
2.45.2
next prev parent reply other threads:[~2024-07-22 9:52 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-22 9:51 [PATCH 0/4] MSM8953/MSM8976 ASoC support Adam Skladowski
2024-07-22 9:51 ` Adam Skladowski [this message]
2024-07-22 12:00 ` [PATCH 1/4] ASoC: qcom: apq8016_sbc.c: Add Quinary support Dmitry Baryshkov
2024-07-22 9:51 ` [PATCH 2/4] ASoC: msm8916-wcd-analog: add cajon and cajon v2 support Adam Skladowski
2024-07-22 9:51 ` [PATCH 3/4] ASoC: dt-bindings: qcom,sm8250: Add msm8953/msm8976-qdsp6-sndcard Adam Skladowski
2024-07-23 8:19 ` Krzysztof Kozlowski
2024-07-23 8:36 ` Krzysztof Kozlowski
2024-07-22 9:51 ` [PATCH 4/4] ASoC: qcom: apq8016_sbc: Add support for msm8953/msm8976 SoC Adam Skladowski
2024-07-22 15:06 ` kernel test robot
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=20240722095147.3372-2-a39.skl@gmail.com \
--to=a39.skl@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=bgoswami@quicinc.com \
--cc=broonie@kernel.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=krzk+dt@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=perex@perex.cz \
--cc=phone-devel@vger.kernel.org \
--cc=robh@kernel.org \
--cc=srinivas.kandagatla@linaro.org \
--cc=tiwai@suse.com \
--cc=vladimir.lypak@gmail.com \
--cc=~postmarketos/upstreaming@lists.sr.ht \
/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).