All of lore.kernel.org
 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 v5 07/20] ASoC: sun4i-i2s: Fix sun8i volatile regs
Date: Sun, 27 Sep 2020 21:28:59 +0200	[thread overview]
Message-ID: <20200927192912.46323-8-peron.clem@gmail.com> (raw)
In-Reply-To: <20200927192912.46323-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


WARNING: multiple messages have this Message-ID (diff)
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 v5 07/20] ASoC: sun4i-i2s: Fix sun8i volatile regs
Date: Sun, 27 Sep 2020 21:28:59 +0200	[thread overview]
Message-ID: <20200927192912.46323-8-peron.clem@gmail.com> (raw)
In-Reply-To: <20200927192912.46323-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


WARNING: multiple messages have this Message-ID (diff)
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>,
	"Jaroslav Kysela" <perex@perex.cz>,
	"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 v5 07/20] ASoC: sun4i-i2s: Fix sun8i volatile regs
Date: Sun, 27 Sep 2020 21:28:59 +0200	[thread overview]
Message-ID: <20200927192912.46323-8-peron.clem@gmail.com> (raw)
In-Reply-To: <20200927192912.46323-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


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2020-09-27 19:30 UTC|newest]

Thread overview: 120+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-27 19:28 [PATCH v5 00/20] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
2020-09-27 19:28 ` Clément Péron
2020-09-27 19:28 ` Clément Péron
2020-09-27 19:28 ` [PATCH v5 01/20] ASoC: sun4i-i2s: Add support for H6 I2S Clément Péron
2020-09-27 19:28   ` Clément Péron
2020-09-27 19:28   ` Clément Péron
2020-09-28  4:40   ` [linux-sunxi] " Chen-Yu Tsai
2020-09-28  4:40     ` Chen-Yu Tsai
2020-09-28  4:40     ` Chen-Yu Tsai
2020-09-28 14:37     ` Clément Péron
2020-09-28 14:37       ` Clément Péron
2020-09-28 14:37       ` Clément Péron
2020-09-28 14:46       ` Chen-Yu Tsai
2020-09-28 14:46         ` Chen-Yu Tsai
2020-09-28 14:46         ` Chen-Yu Tsai
2020-09-27 19:28 ` [PATCH v5 02/20] ASoC: sun4i-i2s: Change set_chan_cfg() params Clément Péron
2020-09-27 19:28   ` Clément Péron
2020-09-27 19:28   ` Clément Péron
2020-09-28  5:00   ` [linux-sunxi] " Chen-Yu Tsai
2020-09-28  5:00     ` Chen-Yu Tsai
2020-09-28  5:00     ` Chen-Yu Tsai
2020-09-28 14:48     ` Clément Péron
2020-09-28 14:48       ` Clément Péron
2020-09-28 14:48       ` Clément Péron
2020-09-27 19:28 ` [PATCH v5 03/20] ASoC: sun4i-i2s: Change get_sr() and get_wss() to be more explicit Clément Péron
2020-09-27 19:28   ` Clément Péron
2020-09-27 19:28   ` Clément Péron
2020-09-28  4:37   ` [linux-sunxi] " Chen-Yu Tsai
2020-09-28  4:37     ` Chen-Yu Tsai
2020-09-28  4:37     ` Chen-Yu Tsai
2020-09-28  5:02     ` Chen-Yu Tsai
2020-09-28  5:02       ` Chen-Yu Tsai
2020-09-28  5:02       ` Chen-Yu Tsai
2020-09-27 19:28 ` [PATCH v5 04/20] dt-bindings: ASoC: sun4i-i2s: Add H6 compatible Clément Péron
2020-09-27 19:28   ` Clément Péron
2020-09-27 19:28   ` Clément Péron
2020-09-28  5:03   ` [linux-sunxi] " Chen-Yu Tsai
2020-09-28  5:03     ` Chen-Yu Tsai
2020-09-28  5:03     ` Chen-Yu Tsai
2020-09-27 19:28 ` [PATCH v5 05/20] ASoC: sun4i-i2s: Set sign extend sample Clément Péron
2020-09-27 19:28   ` Clément Péron
2020-09-27 19:28   ` Clément Péron
2020-09-28  6:52   ` [linux-sunxi] " Chen-Yu Tsai
2020-09-28  6:52     ` Chen-Yu Tsai
2020-09-28  6:52     ` Chen-Yu Tsai
2020-09-27 19:28 ` [PATCH v5 06/20] ASoc: sun4i-i2s: Add 20 and 24 bit support Clément Péron
2020-09-27 19:28   ` Clément Péron
2020-09-27 19:28   ` Clément Péron
2020-09-28  6:51   ` [linux-sunxi] " Chen-Yu Tsai
2020-09-28  6:51     ` Chen-Yu Tsai
2020-09-28  6:51     ` Chen-Yu Tsai
2020-09-27 19:28 ` Clément Péron [this message]
2020-09-27 19:28   ` [PATCH v5 07/20] ASoC: sun4i-i2s: Fix sun8i volatile regs Clément Péron
2020-09-27 19:28   ` Clément Péron
2020-09-28  6:49   ` [linux-sunxi] " Chen-Yu Tsai
2020-09-28  6:49     ` Chen-Yu Tsai
2020-09-28  6:49     ` Chen-Yu Tsai
2020-09-27 19:29 ` [PATCH v5 08/20] ASoC: sun4i-i2s: Fix setting of FIFO modes Clément Péron
2020-09-27 19:29   ` Clément Péron
2020-09-27 19:29   ` Clément Péron
2020-09-28  6:51   ` [linux-sunxi] " Chen-Yu Tsai
2020-09-28  6:51     ` Chen-Yu Tsai
2020-09-28  6:51     ` Chen-Yu Tsai
2020-09-27 19:29 ` [PATCH v5 09/20] arm64: dts: allwinner: h6: Add DAI node and soundcard for HDMI Clément Péron
2020-09-27 19:29   ` Clément Péron
2020-09-27 19:29   ` Clément Péron
2020-09-28  5:32   ` [linux-sunxi] " Chen-Yu Tsai
2020-09-28  5:32     ` Chen-Yu Tsai
2020-09-28  5:32     ` Chen-Yu Tsai
2020-09-28  5:42     ` Chen-Yu Tsai
2020-09-28  5:42       ` Chen-Yu Tsai
2020-09-28  5:42       ` Chen-Yu Tsai
2020-10-02 16:01       ` Clément Péron
2020-10-02 16:01         ` Clément Péron
2020-10-02 16:01         ` Clément Péron
2020-10-02 16:24         ` Maxime Ripard
2020-10-02 16:24           ` Maxime Ripard
2020-10-02 16:24           ` Maxime Ripard
2020-10-03  9:32           ` Clément Péron
2020-10-03  9:32             ` Clément Péron
2020-10-03  9:32             ` Clément Péron
2020-09-27 19:29 ` [PATCH v5 10/20] arm64: dts: allwinner: h6: Enable HDMI sound for Beelink GS1 Clément Péron
2020-09-27 19:29   ` Clément Péron
2020-09-27 19:29   ` Clément Péron
2020-09-28  5:32   ` [linux-sunxi] " Chen-Yu Tsai
2020-09-28  5:32     ` Chen-Yu Tsai
2020-09-28  5:32     ` Chen-Yu Tsai
2020-09-27 19:29 ` [PATCH v5 11/20] arm: dts: sunxi: h3/h5: Add DAI node and soundcard for HDMI Clément Péron
2020-09-27 19:29   ` Clément Péron
2020-09-27 19:29   ` Clément Péron
2020-09-27 19:29 ` [PATCH v5 12/20] arm64: dts: allwinner: a64: " Clément Péron
2020-09-27 19:29   ` Clément Péron
2020-09-27 19:29   ` Clément Péron
2020-09-27 19:29 ` [PATCH v5 13/20] arm: sun8i: h3: Add HDMI audio to Orange Pi 2 Clément Péron
2020-09-27 19:29   ` Clément Péron
2020-09-27 19:29   ` Clément Péron
2020-09-27 19:29 ` [PATCH v5 14/20] arm: sun8i: h3: Add HDMI audio to Beelink X2 Clément Péron
2020-09-27 19:29   ` Clément Péron
2020-09-27 19:29   ` Clément Péron
2020-09-27 19:29 ` [PATCH v5 15/20] arm64: dts: allwinner: a64: Add HDMI audio to Pine64 Clément Péron
2020-09-27 19:29   ` Clément Péron
2020-09-27 19:29   ` Clément Péron
2020-09-27 19:29 ` [PATCH v5 16/20] arm64: dts: allwinner: Enable HDMI audio on Orange Pi PC 2 Clément Péron
2020-09-27 19:29   ` Clément Péron
2020-09-27 19:29   ` Clément Péron
2020-09-27 19:29 ` [PATCH v5 17/20] ARM: dts: sun8i-h3: Enable HDMI audio on Orange Pi PC/One Clément Péron
2020-09-27 19:29   ` Clément Péron
2020-09-27 19:29   ` Clément Péron
2020-09-27 19:29 ` [PATCH v5 18/20] arm64: dts: sun50i-h6-orangepi-3: Enable HDMI audio Clément Péron
2020-09-27 19:29   ` Clément Péron
2020-09-27 19:29   ` Clément Péron
2020-09-27 19:29 ` [PATCH v5 19/20] arm64: defconfig: Enable Allwinner i2s driver Clément Péron
2020-09-27 19:29   ` Clément Péron
2020-09-27 19:29   ` Clément Péron
2020-09-27 19:29 ` [PATCH v5 20/20] ASoC: sun4i-i2s: fix coding-style for callback definition Clément Péron
2020-09-27 19:29   ` Clément Péron
2020-09-27 19:29   ` Clément Péron
2020-09-28  6:52 ` [linux-sunxi] [PATCH v5 00/20] Add Allwinner H3/H5/H6/A64 HDMI audio Chen-Yu Tsai
2020-09-28  6:52   ` Chen-Yu Tsai
2020-09-28  6:52   ` Chen-Yu Tsai

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=20200927192912.46323-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.