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 07/16] ASoC: sun4i-i2s: Fix sun8i volatile regs
Date: Sat, 4 Jul 2020 13:38:53 +0200 [thread overview]
Message-ID: <20200704113902.336911-8-peron.clem@gmail.com> (raw)
In-Reply-To: <20200704113902.336911-1-peron.clem@gmail.com>
The FIFO TX reg is volatile and sun8i i2s register
mapping is different from sun4i.
Even if in this case it's doesn't create an issue,
Avoid setting some regs that are undefined in sun8i.
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
sound/soc/sunxi/sun4i-i2s.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index d7484c7e8fa2..109c10296d83 100644
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -1147,12 +1147,19 @@ static bool sun8i_i2s_rd_reg(struct device *dev, unsigned int reg)
static bool sun8i_i2s_volatile_reg(struct device *dev, unsigned int reg)
{
- if (reg == SUN8I_I2S_INT_STA_REG)
+ switch (reg) {
+ case SUN4I_I2S_FIFO_CTRL_REG:
+ case SUN4I_I2S_FIFO_RX_REG:
+ case SUN4I_I2S_FIFO_STA_REG:
+ case SUN4I_I2S_RX_CNT_REG:
+ case SUN4I_I2S_TX_CNT_REG:
+ case SUN8I_I2S_FIFO_TX_REG:
+ case SUN8I_I2S_INT_STA_REG:
return true;
- if (reg == SUN8I_I2S_FIFO_TX_REG)
- return false;
- return sun4i_i2s_volatile_reg(dev, reg);
+ default:
+ return false;
+ }
}
static const struct reg_default sun4i_i2s_reg_defaults[] = {
--
2.25.1
next prev parent reply other threads:[~2020-07-04 11:40 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-04 11:38 [PATCH 00/16] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
2020-07-04 11:38 ` [PATCH 01/16] ASoC: sun4i-i2s: Add support for H6 I2S Clément Péron
2020-07-06 5:15 ` Maxime Ripard
2020-07-10 5:44 ` [linux-sunxi] " Samuel Holland
2020-07-10 19:22 ` Jernej Škrabec
2020-07-11 1:43 ` Samuel Holland
2020-07-22 8:56 ` Clément Péron
2020-07-04 11:38 ` [PATCH 02/16] ASoC: sun4i-i2s: Adjust LRCLK width Clément Péron
2020-07-10 5:44 ` [linux-sunxi] " Samuel Holland
2020-07-04 11:38 ` [PATCH 03/16] dt-bindings: ASoC: sun4i-i2s: Add H6 compatible Clément Péron
2020-07-04 11:38 ` [PATCH 04/16] ASoC: sun4i-i2s: Set sign extend sample Clément Péron
2020-07-06 5:17 ` Maxime Ripard
2020-07-10 5:44 ` [linux-sunxi] " Samuel Holland
2020-07-22 9:12 ` Clément Péron
2020-07-04 11:38 ` [PATCH 05/16] ASoc: sun4i-i2s: Add 20 and 24 bit support Clément Péron
2020-07-06 5:18 ` Maxime Ripard
2020-07-10 5:44 ` [linux-sunxi] " Samuel Holland
2020-09-02 18:10 ` Jernej Škrabec
2020-09-03 2:22 ` Samuel Holland
2020-09-03 7:40 ` Maxime Ripard
2020-09-04 16:16 ` Charles Keepax
2020-09-04 16:23 ` Mark Brown
2020-07-04 11:38 ` [PATCH 06/16] ASoC: sun4i-i2s: Adjust regmap settings Clément Péron
2020-07-06 5:24 ` Maxime Ripard
2020-07-04 11:38 ` Clément Péron [this message]
2020-07-06 5:25 ` [PATCH 07/16] ASoC: sun4i-i2s: Fix sun8i volatile regs Maxime Ripard
2020-07-04 11:38 ` [PATCH 08/16] arm64: dts: allwinner: h6: Add HDMI audio node Clément Péron
2020-07-06 5:29 ` Maxime Ripard
2020-07-08 16:17 ` Jernej Škrabec
2020-07-04 11:38 ` [PATCH 09/16] arm64: dts: allwinner: h6: Enable HDMI sound for Beelink GS1 Clément Péron
2020-07-04 11:38 ` [PATCH 10/16] arm: dts: sunxi: h3/h5: Add DAI node for HDMI Clément Péron
2020-07-18 21:24 ` [linux-sunxi] " Samuel Holland
2020-07-04 11:38 ` [PATCH 11/16] arm: dts: sunxi: h3/h5: Add HDMI audio Clément Péron
2020-07-04 11:38 ` [PATCH 12/16] arm64: dts: allwinner: a64: Add DAI node for HDMI Clément Péron
2020-07-04 11:38 ` [PATCH 13/16] arm64: dts: allwinner: a64: Add HDMI audio Clément Péron
2020-07-06 5:31 ` Maxime Ripard
2020-07-08 16:00 ` Jernej Škrabec
2020-07-04 11:39 ` [PATCH 14/16] arm: sun8i: h3: Add HDMI audio to Orange Pi 2 Clément Péron
2020-07-04 11:39 ` [PATCH 15/16] arm: sun8i: h3: Add HDMI audio to Beelink X2 Clément Péron
2020-07-04 11:39 ` [PATCH 16/16] arm64: dts: allwinner: a64: Add HDMI audio to Pine64 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=20200704113902.336911-8-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).