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: devicetree@vger.kernel.org,
"Jernej Skrabec" <jernej.skrabec@siol.net>,
alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org,
"Takashi Iwai" <tiwai@suse.com>,
"Marcus Cooper" <codekipper@gmail.com>,
linux-sunxi@googlegroups.com,
"Clément Péron" <peron.clem@gmail.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 07/22] ASoC: sun4i-i2s: Fix sun8i volatile regs
Date: Mon, 21 Sep 2020 12:27:16 +0200 [thread overview]
Message-ID: <20200921102731.747736-8-peron.clem@gmail.com> (raw)
In-Reply-To: <20200921102731.747736-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>
Acked-by: Maxime Ripard <mripard@kernel.org>
---
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 60b2fec1bbe9..3f9110d70941 100644
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -1152,12 +1152,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-09-21 10:34 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-21 10:27 [PATCH v4 00/22] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
2020-09-21 10:27 ` [PATCH v4 01/22] ASoC: sun4i-i2s: Add support for H6 I2S Clément Péron
2020-09-21 10:27 ` [PATCH v4 02/22] ASoC: sun4i-i2s: Change set_chan_cfg() params Clément Péron
2020-09-21 12:29 ` Maxime Ripard
2020-09-21 17:15 ` Clément Péron
2020-09-21 18:23 ` Mark Brown
2020-09-28 8:55 ` Maxime Ripard
2020-09-21 10:27 ` [PATCH v4 03/22] ASoC: sun4i-i2s: Change get_sr() and get_wss() to be more explicit Clément Péron
2020-09-21 13:55 ` Maxime Ripard
2020-09-21 17:22 ` Clément Péron
2020-09-21 10:27 ` [PATCH v4 04/22] dt-bindings: ASoC: sun4i-i2s: Add H6 compatible Clément Péron
2020-09-21 10:27 ` [PATCH v4 05/22] ASoC: sun4i-i2s: Set sign extend sample Clément Péron
2020-09-21 10:27 ` [PATCH v4 06/22] ASoc: sun4i-i2s: Add 20 and 24 bit support Clément Péron
2020-09-21 10:27 ` Clément Péron [this message]
2020-09-21 10:27 ` [PATCH v4 08/22] ASoC: sun4i-i2s: Fix setting of FIFO modes Clément Péron
2020-09-21 10:27 ` [PATCH v4 09/22] arm64: dts: allwinner: h6: Add HDMI audio node Clément Péron
2020-09-21 13:59 ` Maxime Ripard
2020-09-21 17:23 ` Clément Péron
2020-09-21 18:37 ` Jernej Škrabec
2020-09-28 8:43 ` Maxime Ripard
2020-09-28 14:27 ` Clément Péron
2020-09-30 10:19 ` Maxime Ripard
2020-11-01 15:27 ` Clément Péron
2020-11-02 10:21 ` Maxime Ripard
2020-11-02 11:19 ` Clément Péron
2020-09-21 18:29 ` Mark Brown
2020-09-21 10:27 ` [PATCH v4 10/22] arm64: dts: allwinner: h6: Enable HDMI sound for Beelink GS1 Clément Péron
2020-09-21 10:27 ` [PATCH v4 11/22] arm: dts: sunxi: h3/h5: Add DAI node for HDMI Clément Péron
2020-09-21 10:27 ` [PATCH v4 12/22] arm: dts: sunxi: h3/h5: Add HDMI audio Clément Péron
2020-09-21 10:27 ` [PATCH v4 13/22] arm64: dts: allwinner: a64: Add DAI node for HDMI Clément Péron
2020-09-21 10:27 ` [PATCH v4 14/22] arm64: dts: allwinner: a64: Add HDMI audio Clément Péron
2020-09-21 10:27 ` [PATCH v4 15/22] arm: sun8i: h3: Add HDMI audio to Orange Pi 2 Clément Péron
2020-09-21 10:27 ` [PATCH v4 16/22] arm: sun8i: h3: Add HDMI audio to Beelink X2 Clément Péron
2020-09-21 10:27 ` [PATCH v4 17/22] arm64: dts: allwinner: a64: Add HDMI audio to Pine64 Clément Péron
2020-09-21 10:27 ` [PATCH v4 18/22] arm64: dts: allwinner: Enable HDMI audio on Orange Pi PC 2 Clément Péron
2020-09-21 10:27 ` [PATCH v4 19/22] ARM: dts: sun8i-h3: Enable HDMI audio on Orange Pi PC/One Clément Péron
2020-09-21 10:27 ` [PATCH v4 20/22] arm64: dts: sun50i-h6-orangepi-3: Enable HDMI audio Clément Péron
2020-09-21 10:27 ` [PATCH v4 21/22] arm64: defconfig: Enable Allwinner i2s driver Clément Péron
2020-09-21 10:27 ` [PATCH v4 22/22] ASoC: sun4i-i2s: fix coding-style for callback definition 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=20200921102731.747736-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=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).