All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sugar Zhang <sugar.zhang@rock-chips.com>
To: broonie@kernel.org, heiko@sntech.de
Cc: linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org,
	alsa-devel@alsa-project.org,
	Sugar Zhang <sugar.zhang@rock-chips.com>
Subject: [PATCH v2 01/15] ASoC: rockchip: i2s: Add support for set bclk ratio
Date: Tue, 24 Aug 2021 17:17:00 +0800	[thread overview]
Message-ID: <1629796634-4095-1-git-send-email-sugar.zhang@rock-chips.com> (raw)
In-Reply-To: <1629796561-4025-1-git-send-email-sugar.zhang@rock-chips.com>

This patch adds support for set bclk ratio from machine driver.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
---

Changes in v2: None

 sound/soc/rockchip/rockchip_i2s.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
index c7dc350..c9d5c52 100644
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -49,6 +49,7 @@ struct rk_i2s_dev {
 	bool rx_start;
 	bool is_master_mode;
 	const struct rk_i2s_pins *pins;
+	unsigned int bclk_ratio;
 };
 
 static int i2s_runtime_suspend(struct device *dev)
@@ -278,7 +279,7 @@ static int rockchip_i2s_hw_params(struct snd_pcm_substream *substream,
 
 	if (i2s->is_master_mode) {
 		mclk_rate = clk_get_rate(i2s->mclk);
-		bclk_rate = 2 * 32 * params_rate(params);
+		bclk_rate = i2s->bclk_ratio * params_rate(params);
 		if (bclk_rate == 0 || mclk_rate % bclk_rate)
 			return -EINVAL;
 
@@ -413,6 +414,16 @@ static int rockchip_i2s_trigger(struct snd_pcm_substream *substream,
 	return ret;
 }
 
+static int rockchip_i2s_set_bclk_ratio(struct snd_soc_dai *dai,
+				       unsigned int ratio)
+{
+	struct rk_i2s_dev *i2s = to_info(dai);
+
+	i2s->bclk_ratio = ratio;
+
+	return 0;
+}
+
 static int rockchip_i2s_set_sysclk(struct snd_soc_dai *cpu_dai, int clk_id,
 				   unsigned int freq, int dir)
 {
@@ -441,6 +452,7 @@ static int rockchip_i2s_dai_probe(struct snd_soc_dai *dai)
 
 static const struct snd_soc_dai_ops rockchip_i2s_dai_ops = {
 	.hw_params = rockchip_i2s_hw_params,
+	.set_bclk_ratio	= rockchip_i2s_set_bclk_ratio,
 	.set_sysclk = rockchip_i2s_set_sysclk,
 	.set_fmt = rockchip_i2s_set_fmt,
 	.trigger = rockchip_i2s_trigger,
@@ -638,6 +650,8 @@ static int rockchip_i2s_probe(struct platform_device *pdev)
 	i2s->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
 	i2s->capture_dma_data.maxburst = 4;
 
+	i2s->bclk_ratio = 64;
+
 	dev_set_drvdata(&pdev->dev, i2s);
 
 	pm_runtime_enable(&pdev->dev);
-- 
2.7.4




WARNING: multiple messages have this Message-ID (diff)
From: Sugar Zhang <sugar.zhang@rock-chips.com>
To: broonie@kernel.org, heiko@sntech.de
Cc: linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org,
	alsa-devel@alsa-project.org,
	Sugar Zhang <sugar.zhang@rock-chips.com>
Subject: [PATCH v2 01/15] ASoC: rockchip: i2s: Add support for set bclk ratio
Date: Tue, 24 Aug 2021 17:17:00 +0800	[thread overview]
Message-ID: <1629796634-4095-1-git-send-email-sugar.zhang@rock-chips.com> (raw)
In-Reply-To: <1629796561-4025-1-git-send-email-sugar.zhang@rock-chips.com>

This patch adds support for set bclk ratio from machine driver.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
---

Changes in v2: None

 sound/soc/rockchip/rockchip_i2s.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
index c7dc350..c9d5c52 100644
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -49,6 +49,7 @@ struct rk_i2s_dev {
 	bool rx_start;
 	bool is_master_mode;
 	const struct rk_i2s_pins *pins;
+	unsigned int bclk_ratio;
 };
 
 static int i2s_runtime_suspend(struct device *dev)
@@ -278,7 +279,7 @@ static int rockchip_i2s_hw_params(struct snd_pcm_substream *substream,
 
 	if (i2s->is_master_mode) {
 		mclk_rate = clk_get_rate(i2s->mclk);
-		bclk_rate = 2 * 32 * params_rate(params);
+		bclk_rate = i2s->bclk_ratio * params_rate(params);
 		if (bclk_rate == 0 || mclk_rate % bclk_rate)
 			return -EINVAL;
 
@@ -413,6 +414,16 @@ static int rockchip_i2s_trigger(struct snd_pcm_substream *substream,
 	return ret;
 }
 
+static int rockchip_i2s_set_bclk_ratio(struct snd_soc_dai *dai,
+				       unsigned int ratio)
+{
+	struct rk_i2s_dev *i2s = to_info(dai);
+
+	i2s->bclk_ratio = ratio;
+
+	return 0;
+}
+
 static int rockchip_i2s_set_sysclk(struct snd_soc_dai *cpu_dai, int clk_id,
 				   unsigned int freq, int dir)
 {
@@ -441,6 +452,7 @@ static int rockchip_i2s_dai_probe(struct snd_soc_dai *dai)
 
 static const struct snd_soc_dai_ops rockchip_i2s_dai_ops = {
 	.hw_params = rockchip_i2s_hw_params,
+	.set_bclk_ratio	= rockchip_i2s_set_bclk_ratio,
 	.set_sysclk = rockchip_i2s_set_sysclk,
 	.set_fmt = rockchip_i2s_set_fmt,
 	.trigger = rockchip_i2s_trigger,
@@ -638,6 +650,8 @@ static int rockchip_i2s_probe(struct platform_device *pdev)
 	i2s->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
 	i2s->capture_dma_data.maxburst = 4;
 
+	i2s->bclk_ratio = 64;
+
 	dev_set_drvdata(&pdev->dev, i2s);
 
 	pm_runtime_enable(&pdev->dev);
-- 
2.7.4




_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip

WARNING: multiple messages have this Message-ID (diff)
From: Sugar Zhang <sugar.zhang@rock-chips.com>
To: broonie@kernel.org, heiko@sntech.de
Cc: Sugar Zhang <sugar.zhang@rock-chips.com>,
	linux-rockchip@lists.infradead.org, alsa-devel@alsa-project.org,
	devicetree@vger.kernel.org
Subject: [PATCH v2 01/15] ASoC: rockchip: i2s: Add support for set bclk ratio
Date: Tue, 24 Aug 2021 17:17:00 +0800	[thread overview]
Message-ID: <1629796634-4095-1-git-send-email-sugar.zhang@rock-chips.com> (raw)
In-Reply-To: <1629796561-4025-1-git-send-email-sugar.zhang@rock-chips.com>

This patch adds support for set bclk ratio from machine driver.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
---

Changes in v2: None

 sound/soc/rockchip/rockchip_i2s.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
index c7dc350..c9d5c52 100644
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -49,6 +49,7 @@ struct rk_i2s_dev {
 	bool rx_start;
 	bool is_master_mode;
 	const struct rk_i2s_pins *pins;
+	unsigned int bclk_ratio;
 };
 
 static int i2s_runtime_suspend(struct device *dev)
@@ -278,7 +279,7 @@ static int rockchip_i2s_hw_params(struct snd_pcm_substream *substream,
 
 	if (i2s->is_master_mode) {
 		mclk_rate = clk_get_rate(i2s->mclk);
-		bclk_rate = 2 * 32 * params_rate(params);
+		bclk_rate = i2s->bclk_ratio * params_rate(params);
 		if (bclk_rate == 0 || mclk_rate % bclk_rate)
 			return -EINVAL;
 
@@ -413,6 +414,16 @@ static int rockchip_i2s_trigger(struct snd_pcm_substream *substream,
 	return ret;
 }
 
+static int rockchip_i2s_set_bclk_ratio(struct snd_soc_dai *dai,
+				       unsigned int ratio)
+{
+	struct rk_i2s_dev *i2s = to_info(dai);
+
+	i2s->bclk_ratio = ratio;
+
+	return 0;
+}
+
 static int rockchip_i2s_set_sysclk(struct snd_soc_dai *cpu_dai, int clk_id,
 				   unsigned int freq, int dir)
 {
@@ -441,6 +452,7 @@ static int rockchip_i2s_dai_probe(struct snd_soc_dai *dai)
 
 static const struct snd_soc_dai_ops rockchip_i2s_dai_ops = {
 	.hw_params = rockchip_i2s_hw_params,
+	.set_bclk_ratio	= rockchip_i2s_set_bclk_ratio,
 	.set_sysclk = rockchip_i2s_set_sysclk,
 	.set_fmt = rockchip_i2s_set_fmt,
 	.trigger = rockchip_i2s_trigger,
@@ -638,6 +650,8 @@ static int rockchip_i2s_probe(struct platform_device *pdev)
 	i2s->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
 	i2s->capture_dma_data.maxburst = 4;
 
+	i2s->bclk_ratio = 64;
+
 	dev_set_drvdata(&pdev->dev, i2s);
 
 	pm_runtime_enable(&pdev->dev);
-- 
2.7.4




  reply	other threads:[~2021-08-24  9:17 UTC|newest]

Thread overview: 63+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-24  9:16 [PATCH v2 0/15] Patches to update for rockchip i2s Sugar Zhang
2021-08-24  9:16 ` Sugar Zhang
2021-08-24  9:16 ` Sugar Zhang
2021-08-24  9:17 ` Sugar Zhang [this message]
2021-08-24  9:17   ` [PATCH v2 01/15] ASoC: rockchip: i2s: Add support for set bclk ratio Sugar Zhang
2021-08-24  9:17   ` Sugar Zhang
2021-08-24  9:17 ` [PATCH v2 02/15] ASoC: rockchip: i2s: Fixup clk div error Sugar Zhang
2021-08-24  9:17   ` Sugar Zhang
2021-08-24  9:17   ` Sugar Zhang
2021-08-24  9:17 ` [PATCH v2 03/15] ASoC: rockchip: i2s: Improve dma data transfer efficiency Sugar Zhang
2021-08-24  9:17   ` Sugar Zhang
2021-08-24  9:17   ` Sugar Zhang
2021-08-24  9:17 ` [PATCH v2 04/15] ASoC: rockchip: i2s: Fix regmap_ops hang Sugar Zhang
2021-08-24  9:17   ` Sugar Zhang
2021-08-24  9:17   ` Sugar Zhang
2021-08-24  9:17 ` [PATCH v2 05/15] ASoC: rockchip: i2s: Fix concurrency between tx/rx Sugar Zhang
2021-08-24  9:17   ` Sugar Zhang
2021-08-24  9:17   ` Sugar Zhang
2021-08-24  9:17 ` [PATCH v2 06/15] ASoC: rockchip: i2s: Reset the controller if soft reset failed Sugar Zhang
2021-08-24  9:17   ` Sugar Zhang
2021-08-24  9:17   ` Sugar Zhang
2021-08-24  9:17 ` [PATCH v2 07/15] ASoC: dt-bindings: rockchip: Document reset property for i2s Sugar Zhang
2021-08-24  9:17   ` Sugar Zhang
2021-08-24  9:17   ` Sugar Zhang
2021-08-24 17:01   ` Rob Herring
2021-08-24 17:01     ` Rob Herring
2021-08-24 17:01     ` Rob Herring
2021-08-24  9:17 ` [PATCH v2 08/15] ASoC: rockchip: i2s: Fixup config for DAIFMT_DSP_A/B Sugar Zhang
2021-08-24  9:17   ` Sugar Zhang
2021-08-24  9:17   ` Sugar Zhang
2021-08-24  9:17 ` [PATCH v2 09/15] ASoC: rockchip: i2s: Add property to specify play/cap capability Sugar Zhang
2021-08-24  9:17   ` Sugar Zhang
2021-08-24  9:17   ` Sugar Zhang
2021-08-24  9:17 ` [PATCH v2 10/15] ASoC: dt-bindings: rockchip: i2s: Document property for playback/capture Sugar Zhang
2021-08-24  9:17   ` Sugar Zhang
2021-08-24  9:17   ` Sugar Zhang
2021-08-24 17:06   ` Rob Herring
2021-08-24 17:06     ` Rob Herring
2021-08-24 17:06     ` Rob Herring
2021-08-25  9:30     ` [PATCH v2 10/15] ASoC: dt-bindings: rockchip: i2s: Document property for playback/capture【请注意,邮件由robherring2@gmail.com代发】 sugar zhang
2021-08-25  9:30       ` sugar zhang
2021-08-25  9:30       ` sugar zhang
2021-08-24  9:18 ` [PATCH v2 11/15] ASoC: rockchip: i2s: Add compatible for more SoCs Sugar Zhang
2021-08-24  9:18   ` Sugar Zhang
2021-08-24  9:18   ` Sugar Zhang
2021-08-24  9:18 ` [PATCH v2 12/15] ASoC: dt-bindings: rockchip: Add compatible strings " Sugar Zhang
2021-08-24  9:18   ` Sugar Zhang
2021-08-24  9:18   ` Sugar Zhang
2021-08-24 17:07   ` Rob Herring
2021-08-24 17:07     ` Rob Herring
2021-08-24 17:07     ` Rob Herring
2021-08-24  9:18 ` [PATCH v2 13/15] ASoC: rockchip: i2s: Add support for frame inversion Sugar Zhang
2021-08-24  9:18   ` Sugar Zhang
2021-08-24  9:18   ` Sugar Zhang
2021-08-24  9:18 ` [PATCH v2 14/15] ASoC: rockchip: i2s: Add support for TRCM property Sugar Zhang
2021-08-24  9:18   ` Sugar Zhang
2021-08-24  9:18   ` Sugar Zhang
2021-08-24  9:18 ` [PATCH v2 15/15] ASoC: dt-bindings: rockchip: i2s: Document property TRCM Sugar Zhang
2021-08-24  9:18   ` Sugar Zhang
2021-08-24  9:18   ` Sugar Zhang
2021-08-24 17:08   ` Rob Herring
2021-08-24 17:08     ` Rob Herring
2021-08-24 17:08     ` Rob Herring

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=1629796634-4095-1-git-send-email-sugar.zhang@rock-chips.com \
    --to=sugar.zhang@rock-chips.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=heiko@sntech.de \
    --cc=linux-rockchip@lists.infradead.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.