public inbox for alsa-devel@alsa-project.org
 help / color / mirror / Atom feed
From: codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
To: maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org,
	wens-jdAy2FN1RRM@public.gmane.org,
	linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	lgirdwood-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
	broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org,
	be17068-p0aYb1w59bq9tCD/VL7h6Q@public.gmane.org,
	Marcus Cooper
	<codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Subject: [PATCH v3 4/9] ASoC: sun4i-i2s: Fix offset mask
Date: Fri, 21 Dec 2018 16:21:05 +0100	[thread overview]
Message-ID: <20181221152110.17982-5-codekipper@gmail.com> (raw)
In-Reply-To: <20181221152110.17982-1-codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

From: Marcus Cooper <codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

Also add offset to RX channel select

Signed-off-by: Marcus Cooper <codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 sound/soc/sunxi/sun4i-i2s.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index adb988ae9ac5..93a484d7e228 100644
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -110,7 +110,7 @@
 
 #define SUN8I_I2S_TX_CHAN_MAP_REG	0x44
 #define SUN8I_I2S_TX_CHAN_SEL_REG	0x34
-#define SUN8I_I2S_TX_CHAN_OFFSET_MASK		GENMASK(13, 11)
+#define SUN8I_I2S_TX_CHAN_OFFSET_MASK		GENMASK(13, 12)
 #define SUN8I_I2S_TX_CHAN_OFFSET(offset)	(offset << 12)
 #define SUN8I_I2S_TX_CHAN_EN_MASK		GENMASK(11, 4)
 #define SUN8I_I2S_TX_CHAN_EN(num_chan)		(((1 << num_chan) - 1) << 4)
@@ -482,6 +482,10 @@ static int sun4i_i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
 		regmap_update_bits(i2s->regmap, SUN8I_I2S_TX_CHAN_SEL_REG,
 				   SUN8I_I2S_TX_CHAN_OFFSET_MASK,
 				   SUN8I_I2S_TX_CHAN_OFFSET(offset));
+
+		regmap_update_bits(i2s->regmap, SUN8I_I2S_RX_CHAN_SEL_REG,
+				   SUN8I_I2S_TX_CHAN_OFFSET_MASK,
+				   SUN8I_I2S_TX_CHAN_OFFSET(offset));
 	}
 
 	regmap_field_write(i2s->field_fmt_mode, val);
-- 
2.20.1

  parent reply	other threads:[~2018-12-21 15:21 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-21 15:21 [PATCH v3 0/9] ASoC: sun4i-i2s: Updates to the driver codekipper-Re5JQEeQqe8AvxtiuMwx3w
     [not found] ` <20181221152110.17982-1-codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-12-21 15:21   ` [PATCH v3 1/9] ASoC: sun4i-i2s: Adjust regmap settings codekipper-Re5JQEeQqe8AvxtiuMwx3w
     [not found]     ` <20181221152110.17982-2-codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-12-21 16:44       ` Chen-Yu Tsai
2018-12-22 22:12         ` Jonas Karlman
     [not found]           ` <DB7PR03MB46813005FFDFC8609F67F111ACB90-qmxCgCjGUkLCt975IqKlAceAHadYHfrlvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2018-12-23  3:16             ` [alsa-devel] " Chen-Yu Tsai
2019-01-09 18:49               ` Mark Brown
2019-01-09 18:46         ` Mark Brown
2018-12-21 15:21   ` [PATCH v3 2/9] ASoC: sun4i-i2s: Add regmap field to sign extend sample codekipper-Re5JQEeQqe8AvxtiuMwx3w
     [not found]     ` <20181221152110.17982-3-codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-12-21 17:06       ` Chen-Yu Tsai
2018-12-21 15:21   ` [PATCH v3 3/9] ASoc: sun4i-i2s: Add 20, 24 and 32 bit support codekipper-Re5JQEeQqe8AvxtiuMwx3w
     [not found]     ` <20181221152110.17982-4-codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-12-21 16:48       ` Chen-Yu Tsai
     [not found]         ` <CAGb2v67LyDW6kmDrahzLYsY7q9mSJimrZ=jMO3PrPQ=mcxy0qw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-12-21 17:15           ` Chen-Yu Tsai
2018-12-21 15:21   ` codekipper-Re5JQEeQqe8AvxtiuMwx3w [this message]
     [not found]     ` <20181221152110.17982-5-codekipper-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-12-21 16:54       ` [PATCH v3 4/9] ASoC: sun4i-i2s: Fix offset mask Chen-Yu Tsai
2019-01-09 18:50         ` Mark Brown
2018-12-21 15:21   ` [PATCH v3 5/9] ASoC: sun4i-i2s: Correct divider calculations codekipper-Re5JQEeQqe8AvxtiuMwx3w
2018-12-21 15:21   ` [PATCH v3 6/9] ASoC: sun4i-i2s: Add multi-lane functionality codekipper-Re5JQEeQqe8AvxtiuMwx3w
2018-12-21 15:21   ` [PATCH v3 7/9] ASoC: sun4i-i2s: Do not divide clocks when slave codekipper-Re5JQEeQqe8AvxtiuMwx3w
2018-12-21 15:21   ` [PATCH v3 8/9] ASoC: sun4i-i2s: Add set_tdm_slot functionality codekipper-Re5JQEeQqe8AvxtiuMwx3w
2018-12-21 15:21   ` [PATCH v3 9/9] ASoC: sun4i-i2s: Add multichannel functionality codekipper-Re5JQEeQqe8AvxtiuMwx3w

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=20181221152110.17982-5-codekipper@gmail.com \
    --to=codekipper-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
    --cc=alsa-devel-K7yf7f+aM1XWsZ/bQMPhNw@public.gmane.org \
    --cc=be17068-p0aYb1w59bq9tCD/VL7h6Q@public.gmane.org \
    --cc=broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
    --cc=lgirdwood-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
    --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org \
    --cc=maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \
    --cc=wens-jdAy2FN1RRM@public.gmane.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