All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bastien Curutchet <bastien.curutchet@bootlin.com>
To: Liam Girdwood <lgirdwood@gmail.com>,
	Mark Brown <broonie@kernel.org>, Rob Herring <robh+dt@kernel.org>,
	Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
	Conor Dooley <conor+dt@kernel.org>,
	Peter Ujfalusi <peter.ujfalusi@gmail.com>,
	Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
	Bastien Curutchet <bastien.curutchet@bootlin.com>
Cc: linux-sound@vger.kernel.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org,
	Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
	herve.codina@bootlin.com, christophercordahi@nanometrics.ca
Subject: [PATCH 08/13] ASoC: ti: davinci-i2s: Add handling of BP_FC format
Date: Fri, 15 Mar 2024 12:27:40 +0100	[thread overview]
Message-ID: <20240315112745.63230-9-bastien.curutchet@bootlin.com> (raw)
In-Reply-To: <20240315112745.63230-1-bastien.curutchet@bootlin.com>

McBSP is able to drive bit clock and consume frame clock but BP_FC
format is not handled by McBSP driver.

Add BP_FC format support.
When BP_FC is selected:
  - CLKX and CLKR are configured as outputs
  - The sample rate generator is configured to be able to provide bit
    clock.

Signed-off-by: Bastien Curutchet <bastien.curutchet@bootlin.com>
---
 sound/soc/ti/davinci-i2s.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/sound/soc/ti/davinci-i2s.c b/sound/soc/ti/davinci-i2s.c
index 4adaed010700..7cdd86f47ead 100644
--- a/sound/soc/ti/davinci-i2s.c
+++ b/sound/soc/ti/davinci-i2s.c
@@ -306,6 +306,12 @@ static int davinci_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai,
 		pcr = DAVINCI_MCBSP_PCR_FSRM | DAVINCI_MCBSP_PCR_FSXM;
 		pcr |= DAVINCI_MCBSP_PCR_SCLKME;
 		break;
+	case SND_SOC_DAIFMT_BP_FC:
+		/* cpu is bitclock provider */
+		pcr = DAVINCI_MCBSP_PCR_CLKXM |
+			DAVINCI_MCBSP_PCR_CLKRM;
+		break;
+
 	case SND_SOC_DAIFMT_BC_FC:
 		/* codec is master */
 		pcr = 0;
@@ -491,6 +497,23 @@ static int davinci_i2s_hw_params(struct snd_pcm_substream *substream,
 		clk_div &= 0xFF;
 		srgr |= clk_div;
 		break;
+	case SND_SOC_DAIFMT_BP_FC:
+		if (dev->ext_clk) {
+			freq = clk_get_rate(dev->ext_clk);
+		} else {
+			freq = clk_get_rate(dev->clk);
+			srgr = DAVINCI_MCBSP_SRGR_CLKSM;
+		}
+		if (dev->tdm_slots && dev->slot_width) {
+			clk_div = freq / (params->rate_num * params->rate_den)
+				 / (dev->tdm_slots * dev->slot_width) - 1;
+		} else {
+			clk_div = freq / (mcbsp_word_length * 16) /
+				  params->rate_num * params->rate_den;
+		}
+		clk_div &= 0xFF;
+		srgr |= clk_div;
+		break;
 	case SND_SOC_DAIFMT_BC_FC:
 		/* Clock and frame sync given from external sources */
 		i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_SAMPLE_BITS);
-- 
2.43.2


  parent reply	other threads:[~2024-03-15 11:28 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-15 11:27 [PATCH 00/13] ASoC: ti: davinci-i2s: Add features to McBSP driver Bastien Curutchet
2024-03-15 11:27 ` [PATCH 01/13] ASoC: dt-bindings: davinci-mcbsp: convert McBSP bindings to yaml schema Bastien Curutchet
2024-03-17 20:04   ` Rob Herring
2024-03-15 11:27 ` [PATCH 02/13] ASoC: dt-bindings: davinci-mcbsp: Add new properties Bastien Curutchet
2024-03-17 20:06   ` Rob Herring
2024-03-15 11:27 ` [PATCH 03/13] ASoC: ti: davinci-i2s: Remove the unused clk_input_pin attribute Bastien Curutchet
2024-03-15 11:27 ` [PATCH 04/13] ASoC: ti: davinci-i2s: Replace dev_err with dev_err_probe Bastien Curutchet
2024-03-15 14:07   ` Mark Brown
2024-03-15 14:23     ` Herve Codina
2024-03-15 14:40       ` Mark Brown
2024-03-18  7:40         ` Bastien Curutchet
2024-03-18 13:28           ` Mark Brown
2024-03-15 11:27 ` [PATCH 05/13] ASoC: ti: davinci-i2s: Use external clock to drive sample rate generator Bastien Curutchet
2024-03-15 11:27 ` [PATCH 06/13] ASoC: ti: davinci-i2s: Delete unnecessary assignment Bastien Curutchet
2024-03-15 11:27 ` [PATCH 07/13] ASoC: ti: davinci-i2s: Add TDM support Bastien Curutchet
2024-03-19 15:57   ` Péter Ujfalusi
2024-03-20  7:31     ` Bastien Curutchet
2024-03-20 15:14       ` Péter Ujfalusi
2024-03-15 11:27 ` Bastien Curutchet [this message]
2024-03-15 11:27 ` [PATCH 09/13] ASoC: ti: davinci-i2s: Enable unexpected frame pulses detection Bastien Curutchet
2024-03-15 14:09   ` Mark Brown
2024-03-15 14:45     ` Bastien Curutchet
2024-03-15 14:54       ` Mark Brown
2024-03-15 11:27 ` [PATCH 10/13] ASoC: ti: davinci-i2s: Make free-running mode optional Bastien Curutchet
2024-03-15 14:10   ` Mark Brown
2024-03-15 11:27 ` [PATCH 11/13] ASoC: ti: davinci-i2s: Add S24_LE to supported formats Bastien Curutchet
2024-03-15 11:27 ` [PATCH 12/13] ASoC: dt-bindings: davinic-mcbsp: Add the 'ti,drive-dx' property Bastien Curutchet
2024-03-17 20:10   ` Rob Herring
2024-03-19 18:02   ` Péter Ujfalusi
2024-03-20  7:46     ` Bastien Curutchet
2024-03-15 11:27 ` [PATCH 13/13] ASoC: ti: davinci-i2s: Opitonally drive DX pin during capture streams Bastien Curutchet
2024-03-19 18:29   ` Péter Ujfalusi
2024-03-20  8:52     ` Bastien Curutchet
2024-03-20 15:42       ` Péter Ujfalusi
2024-03-20 20:30         ` Péter Ujfalusi
2024-03-21 15:14           ` Bastien Curutchet
2024-03-21 18:31             ` Péter Ujfalusi
2024-03-22  8:58               ` Bastien Curutchet
2024-03-29 13:24                 ` Bastien Curutchet

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=20240315112745.63230-9-bastien.curutchet@bootlin.com \
    --to=bastien.curutchet@bootlin.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=christophercordahi@nanometrics.ca \
    --cc=conor+dt@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=herve.codina@bootlin.com \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sound@vger.kernel.org \
    --cc=perex@perex.cz \
    --cc=peter.ujfalusi@gmail.com \
    --cc=robh+dt@kernel.org \
    --cc=thomas.petazzoni@bootlin.com \
    --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 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.