devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Clément Péron" <peron.clem@gmail.com>
To: Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>,
	Rob Herring <robh+dt@kernel.org>, Mark Brown <broonie@kernel.org>,
	Liam Girdwood <lgirdwood@gmail.com>
Cc: "Jaroslav Kysela" <perex@perex.cz>,
	"Takashi Iwai" <tiwai@suse.com>,
	"Marcus Cooper" <codekipper@gmail.com>,
	"Jernej Skrabec" <jernej.skrabec@siol.net>,
	alsa-devel@alsa-project.org, devicetree@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com,
	"Clément Péron" <peron.clem@gmail.com>
Subject: [PATCH v3 04/19] ASoC: sun4i-i2s: Set sign extend sample
Date: Sun, 20 Sep 2020 20:07:43 +0200	[thread overview]
Message-ID: <20200920180758.592217-5-peron.clem@gmail.com> (raw)
In-Reply-To: <20200920180758.592217-1-peron.clem@gmail.com>

From: Marcus Cooper <codekipper@gmail.com>

On the newer SoCs such as the H3 and A64 this is set by default
to transfer a 0 after each sample in each slot. However the A10
and A20 SoCs that this driver was developed on had a default
setting where it padded the audio gain with zeros.

This isn't a problem while we have only support for 16bit audio
but with larger sample resolution rates in the pipeline then SEXT
bits should be cleared so that they also pad at the LSB. Without
this the audio gets distorted.

Set sign extend sample for all the sunxi generations even if they
are not affected. This will keep consistency and avoid relying on
default.

Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
 sound/soc/sunxi/sun4i-i2s.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index 246d4a45edae..57a68222f99a 100644
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -48,6 +48,9 @@
 #define SUN4I_I2S_FMT0_FMT_I2S				(0 << 0)
 
 #define SUN4I_I2S_FMT1_REG		0x08
+#define SUN4I_I2S_FMT1_REG_SEXT_MASK		BIT(8)
+#define SUN4I_I2S_FMT1_REG_SEXT(sext)			((sext) << 8)
+
 #define SUN4I_I2S_FIFO_TX_REG		0x0c
 #define SUN4I_I2S_FIFO_RX_REG		0x10
 
@@ -105,6 +108,9 @@
 #define SUN8I_I2S_FMT0_BCLK_POLARITY_INVERTED		(1 << 7)
 #define SUN8I_I2S_FMT0_BCLK_POLARITY_NORMAL		(0 << 7)
 
+#define SUN8I_I2S_FMT1_REG_SEXT_MASK		GENMASK(5, 4)
+#define SUN8I_I2S_FMT1_REG_SEXT(sext)			((sext) << 4)
+
 #define SUN8I_I2S_INT_STA_REG		0x0c
 #define SUN8I_I2S_FIFO_TX_REG		0x20
 
@@ -656,6 +662,7 @@ static int sun4i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s,
 	}
 	regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG,
 			   SUN4I_I2S_CTRL_MODE_MASK, val);
+
 	return 0;
 }
 
@@ -758,6 +765,11 @@ static int sun8i_i2s_set_soc_fmt(const struct sun4i_i2s *i2s,
 			   SUN8I_I2S_CTRL_BCLK_OUT | SUN8I_I2S_CTRL_LRCK_OUT,
 			   val);
 
+	/* Set sign extension to pad out LSB with 0 */
+	regmap_update_bits(i2s->regmap, SUN4I_I2S_FMT1_REG,
+			   SUN8I_I2S_FMT1_REG_SEXT_MASK,
+			   SUN8I_I2S_FMT1_REG_SEXT(0));
+
 	return 0;
 }
 
@@ -854,6 +866,11 @@ static int sun50i_h6_i2s_set_soc_fmt(const struct sun4i_i2s *i2s,
 			   SUN8I_I2S_CTRL_BCLK_OUT | SUN8I_I2S_CTRL_LRCK_OUT,
 			   val);
 
+	/* Set sign extension to pad out LSB with 0 */
+	regmap_update_bits(i2s->regmap, SUN4I_I2S_FMT1_REG,
+			   SUN8I_I2S_FMT1_REG_SEXT_MASK,
+			   SUN8I_I2S_FMT1_REG_SEXT(0));
+
 	return 0;
 }
 
-- 
2.25.1


  parent reply	other threads:[~2020-09-20 18:09 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-20 18:07 [PATCH v3 00/19] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
2020-09-20 18:07 ` [PATCH v3 01/19] ASoC: sun4i-i2s: Add support for H6 I2S Clément Péron
2020-09-20 18:39   ` Samuel Holland
2020-09-20 19:38     ` Clément Péron
2020-09-20 18:07 ` [PATCH v3 02/19] ASoC: sun4i-i2s: Change set_chan_cfg params Clément Péron
2020-09-20 18:07 ` [PATCH v3 03/19] dt-bindings: ASoC: sun4i-i2s: Add H6 compatible Clément Péron
2020-09-20 18:07 ` Clément Péron [this message]
2020-09-20 18:07 ` [PATCH v3 05/19] ASoc: sun4i-i2s: Add 20 and 24 bit support Clément Péron
2020-09-20 18:45   ` Samuel Holland
2020-09-20 21:32     ` Clément Péron
2020-09-20 18:07 ` [PATCH v3 06/19] ASoC: sun4i-i2s: Fix sun8i volatile regs Clément Péron
2020-09-20 18:52   ` Samuel Holland
2020-09-20 20:05     ` Clément Péron
2020-09-20 18:07 ` [PATCH v3 07/19] arm64: dts: allwinner: h6: Add HDMI audio node Clément Péron
2020-09-20 18:07 ` [PATCH v3 08/19] arm64: dts: allwinner: h6: Enable HDMI sound for Beelink GS1 Clément Péron
2020-09-20 18:07 ` [PATCH v3 09/19] arm: dts: sunxi: h3/h5: Add DAI node for HDMI Clément Péron
2020-09-20 18:07 ` [PATCH v3 10/19] arm: dts: sunxi: h3/h5: Add HDMI audio Clément Péron
2020-09-20 18:07 ` [PATCH v3 11/19] arm64: dts: allwinner: a64: Add DAI node for HDMI Clément Péron
2020-09-20 18:07 ` [PATCH v3 12/19] arm64: dts: allwinner: a64: Add HDMI audio Clément Péron
2020-09-20 18:07 ` [PATCH v3 13/19] arm: sun8i: h3: Add HDMI audio to Orange Pi 2 Clément Péron
2020-09-20 18:07 ` [PATCH v3 14/19] arm: sun8i: h3: Add HDMI audio to Beelink X2 Clément Péron
2020-09-20 18:07 ` [PATCH v3 15/19] arm64: dts: allwinner: a64: Add HDMI audio to Pine64 Clément Péron
2020-09-20 18:07 ` [PATCH v3 16/19] arm64: dts: allwinner: Enable HDMI audio on Orange Pi PC 2 Clément Péron
2020-09-20 18:07 ` [PATCH v3 17/19] ARM: dts: sun8i-h3: Enable HDMI audio on Orange Pi PC/One Clément Péron
2020-09-20 18:07 ` [PATCH v3 18/19] arm64: dts: sun50i-h6-orangepi-3: Enable HDMI audio Clément Péron
2020-09-20 18:07 ` [PATCH v3 19/19] arm64: defconfig: Enable Allwinner i2s driver Clément Péron

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=20200920180758.592217-5-peron.clem@gmail.com \
    --to=peron.clem@gmail.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=codekipper@gmail.com \
    --cc=devicetree@vger.kernel.org \
    --cc=jernej.skrabec@siol.net \
    --cc=lgirdwood@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sunxi@googlegroups.com \
    --cc=mripard@kernel.org \
    --cc=perex@perex.cz \
    --cc=robh+dt@kernel.org \
    --cc=tiwai@suse.com \
    --cc=wens@csie.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 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).