mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Syed Saba Kareem <Syed.SabaKareem@amd.com>
To: <broonie@kernel.org>, <alsa-devel@alsa-project.org>
Cc: <Vijendar.Mukunda@amd.com>, <Basavaraj.Hiregoudar@amd.com>,
	<Sunil-kumar.Dommati@amd.com>, <mario.limonciello@amd.com>,
	<venkataprasad.potturu@amd.com>, <arungopal.kondaveeti@amd.com>,
	<mastan.katragadda@amd.com>, <juan.martinez@amd.com>,
	Syed Saba Kareem <Syed.SabaKareem@amd.com>,
	Liam Girdwood <lgirdwood@gmail.com>,
	"Jaroslav Kysela" <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
	Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
	open list <linux-kernel@vger.kernel.org>
Subject: [PATCH 03/13] ASoC: amd: acp: add i2s clock generation support for acp6.3 based platforms
Date: Sat, 21 Oct 2023 20:20:44 +0530	[thread overview]
Message-ID: <20231021145110.478744-3-Syed.SabaKareem@amd.com> (raw)
In-Reply-To: <20231021145110.478744-1-Syed.SabaKareem@amd.com>

Add I2S LRCLK & BCLK generation code for ACP6.3 based platforms.

Signed-off-by: Syed Saba Kareem <Syed.SabaKareem@amd.com>
---
 sound/soc/amd/acp/acp-i2s.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/sound/soc/amd/acp/acp-i2s.c b/sound/soc/amd/acp/acp-i2s.c
index 59d3a499771a..1185e5aac523 100644
--- a/sound/soc/amd/acp/acp-i2s.c
+++ b/sound/soc/amd/acp/acp-i2s.c
@@ -27,14 +27,19 @@
 #define DRV_NAME "acp_i2s_playcap"
 #define	I2S_MASTER_MODE_ENABLE		1
 #define	I2S_MODE_ENABLE			0
-#define	I2S_FORMAT_MODE			GENMASK(1, 1)
 #define	LRCLK_DIV_FIELD			GENMASK(10, 2)
 #define	BCLK_DIV_FIELD			GENMASK(23, 11)
+#define	ACP63_LRCLK_DIV_FIELD		GENMASK(12, 2)
+#define	ACP63_BCLK_DIV_FIELD		GENMASK(23, 13)
 
 static inline void acp_set_i2s_clk(struct acp_dev_data *adata, int dai_id)
 {
 	u32 i2s_clk_reg, val;
+	struct acp_chip_info *chip;
+	struct device *dev;
 
+	dev = adata->dev;
+	chip = dev_get_platdata(dev);
 	switch (dai_id) {
 	case I2S_SP_INSTANCE:
 		i2s_clk_reg = ACP_I2STDM0_MSTRCLKGEN;
@@ -52,8 +57,16 @@ static inline void acp_set_i2s_clk(struct acp_dev_data *adata, int dai_id)
 
 	val  = I2S_MASTER_MODE_ENABLE;
 	val |= I2S_MODE_ENABLE & BIT(1);
-	val |= FIELD_PREP(LRCLK_DIV_FIELD, adata->lrclk_div);
-	val |= FIELD_PREP(BCLK_DIV_FIELD, adata->bclk_div);
+
+	switch (chip->acp_rev) {
+	case ACP63_DEV:
+		val |= FIELD_PREP(ACP63_LRCLK_DIV_FIELD, adata->lrclk_div);
+		val |= FIELD_PREP(ACP63_BCLK_DIV_FIELD, adata->bclk_div);
+		break;
+	default:
+		val |= FIELD_PREP(LRCLK_DIV_FIELD, adata->lrclk_div);
+		val |= FIELD_PREP(BCLK_DIV_FIELD, adata->bclk_div);
+	}
 	writel(val, adata->acp_base + i2s_clk_reg);
 }
 
-- 
2.25.1


  parent reply	other threads:[~2023-10-21 14:51 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-21 14:50 [PATCH 01/13] ASoC: amd: acp: Add acp6.3 pci legacy driver support Syed Saba Kareem
2023-10-21 14:50 ` [PATCH 02/13] ASoC: amd: acp: refactor acp i2s clock generation code Syed Saba Kareem
2023-10-23  7:37   ` Amadeusz Sławiński
2023-10-21 14:50 ` Syed Saba Kareem [this message]
2023-10-21 14:50 ` [PATCH 04/13] ASoC: amd: acp: add machine driver support for acp6.3 platform Syed Saba Kareem
2023-10-21 14:50 ` [PATCH 05/13] ASoC: amd: acp: add Kconfig options for acp6.3 based platform driver Syed Saba Kareem
2023-10-21 14:50 ` [PATCH 06/13] ASoC: amd: acp: add code for scanning acp pdm controller Syed Saba Kareem
2023-10-21 14:50 ` [PATCH 07/13] ASoC: amd: acp: add platform and flag data to acp data structure Syed Saba Kareem
2023-10-21 14:50 ` [PATCH 08/13] ASoC: amd: acp: add condition check for i2s clock generation Syed Saba Kareem
2023-10-21 14:50 ` [PATCH 09/13] ASoC: amd: acp: add machine driver support for pdm use case Syed Saba Kareem
2023-10-27  8:49   ` Krzysztof Kozlowski
     [not found]     ` <3ec97548-1f91-49d0-adfb-4f8051ca9a97@amd.com>
     [not found]       ` <f8f8017c-4e76-4d70-918f-d7cb45186184@kernel.org>
     [not found]         ` <c0ea139c-9861-4ea1-b547-6e3c380301b3@amd.com>
     [not found]           ` <ZTvkCAYsrS62/82u@finisterre.sirena.org.uk>
2023-10-27 17:32             ` syed saba kareem
2023-10-28  9:14               ` Krzysztof Kozlowski
2023-10-21 14:50 ` [PATCH 10/13] ASoC: amd: acp: change acp-deinit function arguments Syed Saba Kareem
2023-10-21 14:50 ` [PATCH 11/13] ASoC: amd: acp: change acp power on mask macro value Syed Saba Kareem
2023-10-21 14:50 ` [PATCH 12/13] ASoC: amd: acp: Add pci legacy driver support for acp7.0 platform Syed Saba Kareem
2023-10-23  7:50   ` Amadeusz Sławiński
2023-10-26 10:04     ` syed saba kareem
2023-10-21 14:50 ` [PATCH 13/13] ASoC: amd: acp: add machine driver support for acp7.0 Syed Saba Kareem
2023-10-23  8:01 ` [PATCH 01/13] ASoC: amd: acp: Add acp6.3 pci legacy driver support Krzysztof Kozlowski
     [not found]   ` <12c8c0f3-8364-4f25-976e-8cca29b5e17f@amd.com>
2023-10-26 15:00     ` Krzysztof Kozlowski
2023-10-25 16:50 ` Mark Brown
2023-10-26  9:44   ` syed saba kareem
2023-10-26 15:12 ` Mark Brown

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=20231021145110.478744-3-Syed.SabaKareem@amd.com \
    --to=syed.sabakareem@amd.com \
    --cc=Basavaraj.Hiregoudar@amd.com \
    --cc=Sunil-kumar.Dommati@amd.com \
    --cc=Vijendar.Mukunda@amd.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=arungopal.kondaveeti@amd.com \
    --cc=broonie@kernel.org \
    --cc=juan.martinez@amd.com \
    --cc=kuninori.morimoto.gx@renesas.com \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mario.limonciello@amd.com \
    --cc=mastan.katragadda@amd.com \
    --cc=perex@perex.cz \
    --cc=tiwai@suse.com \
    --cc=venkataprasad.potturu@amd.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

all inboxes | Powered by JetHome®