Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Ben Dooks <ben.dooks@codethink.co.uk>
To: linux-tegra@vger.kernel.org, alsa-devel@alsa-project.org,
	Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
	Liam Girdwood <lgirdwood@gmail.com>,
	Mark Brown <broonie@kernel.org>,
	Thierry Reding <thierry.reding@gmail.com>,
	Jonathan Hunter <jonathanh@nvidia.com>
Cc: linux-kernel@lists.codethink.co.uk,
	Ben Dooks <ben.dooks@codethink.co.uk>
Subject: [alsa-devel] [PATCH 8/8] ASoC: tegra: take packing settings from the audio cif_config
Date: Tue, 17 Sep 2019 19:12:33 +0100	[thread overview]
Message-ID: <20190917181233.534-9-ben.dooks@codethink.co.uk> (raw)
In-Reply-To: <20190917181233.534-1-ben.dooks@codethink.co.uk>

If the CIF is not configured as 16 or 8 bit, then the
packing for 8/16 bits should not be enabled as the
hardware only supports 8 or 16 bit packing.

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
---
 sound/soc/tegra/tegra30_ahub.c | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/sound/soc/tegra/tegra30_ahub.c b/sound/soc/tegra/tegra30_ahub.c
index 58e05ceb86da..c2f2e29dd32e 100644
--- a/sound/soc/tegra/tegra30_ahub.c
+++ b/sound/soc/tegra/tegra30_ahub.c
@@ -96,10 +96,17 @@ int tegra30_ahub_setup_rx_fifo(enum tegra30_ahub_rxcif rxcif,
 	      (channel * TEGRA30_AHUB_CHANNEL_CTRL_STRIDE);
 	val = tegra30_apbif_read(reg);
 	val &= ~(TEGRA30_AHUB_CHANNEL_CTRL_RX_THRESHOLD_MASK |
-		 TEGRA30_AHUB_CHANNEL_CTRL_RX_PACK_MASK);
-	val |= (7 << TEGRA30_AHUB_CHANNEL_CTRL_RX_THRESHOLD_SHIFT) |
-	       TEGRA30_AHUB_CHANNEL_CTRL_RX_PACK_EN |
-	       TEGRA30_AHUB_CHANNEL_CTRL_RX_PACK_16;
+		 TEGRA30_AHUB_CHANNEL_CTRL_RX_PACK_MASK |
+		 TEGRA30_AHUB_CHANNEL_CTRL_RX_PACK_EN);
+	val |= (7 << TEGRA30_AHUB_CHANNEL_CTRL_RX_THRESHOLD_SHIFT);
+	if (cif_conf->audio_bits == TEGRA30_AUDIOCIF_BITS_16 ||
+	    cif_conf->audio_bits == TEGRA30_AUDIOCIF_BITS_8)
+		val |= TEGRA30_AHUB_CHANNEL_CTRL_RX_PACK_EN;
+	if (cif_conf->audio_bits == TEGRA30_AUDIOCIF_BITS_16)
+		val |= TEGRA30_AHUB_CHANNEL_CTRL_RX_PACK_16;
+	if (cif_conf->audio_bits == TEGRA30_AUDIOCIF_BITS_8)
+		val |= TEGRA30_AHUB_CHANNEL_CTRL_RX_PACK_8_4;
+
 	tegra30_apbif_write(reg, val);
 
 	cif_conf->direction = TEGRA30_AUDIOCIF_DIRECTION_RX;
@@ -203,10 +210,16 @@ int tegra30_ahub_setup_tx_fifo(enum tegra30_ahub_txcif txcif,
 	      (channel * TEGRA30_AHUB_CHANNEL_CTRL_STRIDE);
 	val = tegra30_apbif_read(reg);
 	val &= ~(TEGRA30_AHUB_CHANNEL_CTRL_TX_THRESHOLD_MASK |
-		 TEGRA30_AHUB_CHANNEL_CTRL_TX_PACK_MASK);
-	val |= (7 << TEGRA30_AHUB_CHANNEL_CTRL_TX_THRESHOLD_SHIFT) |
-	       TEGRA30_AHUB_CHANNEL_CTRL_TX_PACK_EN |
-	       TEGRA30_AHUB_CHANNEL_CTRL_TX_PACK_16;
+		 TEGRA30_AHUB_CHANNEL_CTRL_TX_PACK_MASK |
+		 TEGRA30_AHUB_CHANNEL_CTRL_TX_PACK_EN);
+	val |= (7 << TEGRA30_AHUB_CHANNEL_CTRL_TX_THRESHOLD_SHIFT);
+	if (cif_conf->audio_bits == TEGRA30_AUDIOCIF_BITS_16 ||
+	    cif_conf->audio_bits == TEGRA30_AUDIOCIF_BITS_8)
+		val |= TEGRA30_AHUB_CHANNEL_CTRL_TX_PACK_EN;
+	if (cif_conf->audio_bits == TEGRA30_AUDIOCIF_BITS_16)
+		val |= TEGRA30_AHUB_CHANNEL_CTRL_TX_PACK_16;
+	if (cif_conf->audio_bits == TEGRA30_AUDIOCIF_BITS_8)
+		val |= TEGRA30_AHUB_CHANNEL_CTRL_TX_PACK_8_4;
 	tegra30_apbif_write(reg, val);
 
 	cif_conf->direction = TEGRA30_AUDIOCIF_DIRECTION_TX;
-- 
2.23.0

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

  parent reply	other threads:[~2019-09-17 18:13 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-17 18:12 [alsa-devel] RFC: TDM mode support on the tegra30 Ben Dooks
2019-09-17 18:12 ` [alsa-devel] [PATCH 1/8] ASoC: tegra: Add a TDM configuration callback Ben Dooks
2019-09-17 18:22   ` Pierre-Louis Bossart
2019-09-18  8:42   ` Jon Hunter
2019-09-18 10:11     ` Ben Dooks
2019-09-18 10:25       ` Jon Hunter
2019-09-18 10:48         ` Mark Brown
2019-09-18 11:44           ` Ben Dooks
2019-09-18 13:33           ` Pierre-Louis Bossart
2019-09-18 15:02             ` Mark Brown
2019-09-17 18:12 ` [alsa-devel] [PATCH 2/8] ASoC: tegra: Allow 24bit and 32bit samples Ben Dooks
2019-09-17 18:26   ` Pierre-Louis Bossart
2019-09-18  7:44     ` Ben Dooks
2019-09-18 10:08       ` Mark Brown
2019-09-18 11:50         ` Ben Dooks
2019-09-18 12:05           ` Mark Brown
2019-09-17 18:12 ` [alsa-devel] [PATCH 3/8] ASoC: tegra: i2s: Add support for more than 2 channels Ben Dooks
2019-09-18  8:50   ` Jon Hunter
2019-09-18 10:12     ` Ben Dooks
2019-09-17 18:12 ` [alsa-devel] [PATCH 4/8] ASoC: tegra: disable rx_fifo after disable stream Ben Dooks
2019-09-17 18:12 ` [alsa-devel] [PATCH 5/8] ASoC: tegra: set edge mode for TDM correctly Ben Dooks
2019-09-17 19:33   ` kbuild test robot
2019-09-18  8:54   ` Jon Hunter
2019-09-18  9:02     ` Jon Hunter
2019-09-18 10:15       ` Ben Dooks
2019-09-17 18:12 ` [alsa-devel] [PATCH 6/8] ASoC: tegra: set i2s_offset to 0 for tdm Ben Dooks
2019-09-18  9:02   ` Jon Hunter
2019-09-18 11:30     ` Ben Dooks
2019-09-17 18:12 ` [alsa-devel] [PATCH 7/8] ASoC: tegra: config fifos on hw_param changes Ben Dooks
2019-09-18  9:14   ` Jon Hunter
2019-09-18 11:41     ` Ben Dooks
2019-09-17 18:12 ` Ben Dooks [this message]
2019-09-18  9:16   ` [alsa-devel] [PATCH 8/8] ASoC: tegra: take packing settings from the audio cif_config Jon Hunter
2019-09-18 10:02     ` Sameer Pujar

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=20190917181233.534-9-ben.dooks@codethink.co.uk \
    --to=ben.dooks@codethink.co.uk \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=jonathanh@nvidia.com \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@lists.codethink.co.uk \
    --cc=linux-tegra@vger.kernel.org \
    --cc=perex@perex.cz \
    --cc=thierry.reding@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox