All of lore.kernel.org
 help / color / mirror / Atom feed
From: Nikita Shubin <nikita.shubin@maquefel.me>
To: Alexander Sverdlin <alexander.sverdlin@gmail.com>,
	Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Nikita Shubin <nikita.shubin@maquefel.me>,
	Liam Girdwood <lgirdwood@gmail.com>,
	Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
	Takashi Iwai <tiwai@suse.com>,
	Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
	alsa-devel@alsa-project.org (moderated list:SOUND - SOC LAYER /
	DYNAMIC AUDIO POWER MANAGEM...),
	linux-kernel@vger.kernel.org (open list)
Subject: [PATCH v2 6/8] ASoC: cirrus: i2s: Prepare clock before using it
Date: Mon, 26 Jul 2021 16:59:54 +0300	[thread overview]
Message-ID: <20210726140001.24820-7-nikita.shubin@maquefel.me> (raw)
In-Reply-To: <20210726140001.24820-1-nikita.shubin@maquefel.me>

From: Alexander Sverdlin <alexander.sverdlin@gmail.com>

Use clk_prepare_enable()/clk_disable_unprepare() in preparation for switch
to Common Clock Framework, otherwise the following is visible:

WARNING: CPU: 0 PID: 97 at drivers/clk/clk.c:1011 clk_core_enable+0x9c/0xbc
Enabling unprepared mclk
...
Hardware name: Cirrus Logic EDB9302 Evaluation Board
...
clk_core_enable
clk_core_enable_lock
ep93xx_i2s_hw_params
snd_soc_dai_hw_params
soc_pcm_hw_params
snd_pcm_hw_params
snd_pcm_ioctl
...

Signed-off-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
Signed-off-by: Nikita Shubin <nikita.shubin@maquefel.me>
---
 sound/soc/cirrus/ep93xx-i2s.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/soc/cirrus/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c
index 0d26550d0df8..4d3179f03202 100644
--- a/sound/soc/cirrus/ep93xx-i2s.c
+++ b/sound/soc/cirrus/ep93xx-i2s.c
@@ -111,9 +111,9 @@ static void ep93xx_i2s_enable(struct ep93xx_i2s_info *info, int stream)
 	if ((ep93xx_i2s_read_reg(info, EP93XX_I2S_TX0EN) & 0x1) == 0 &&
 	    (ep93xx_i2s_read_reg(info, EP93XX_I2S_RX0EN) & 0x1) == 0) {
 		/* Enable clocks */
-		clk_enable(info->mclk);
-		clk_enable(info->sclk);
-		clk_enable(info->lrclk);
+		clk_prepare_enable(info->mclk);
+		clk_prepare_enable(info->sclk);
+		clk_prepare_enable(info->lrclk);
 
 		/* Enable i2s */
 		ep93xx_i2s_write_reg(info, EP93XX_I2S_GLCTRL, 1);
@@ -156,9 +156,9 @@ static void ep93xx_i2s_disable(struct ep93xx_i2s_info *info, int stream)
 		ep93xx_i2s_write_reg(info, EP93XX_I2S_GLCTRL, 0);
 
 		/* Disable clocks */
-		clk_disable(info->lrclk);
-		clk_disable(info->sclk);
-		clk_disable(info->mclk);
+		clk_disable_unprepare(info->lrclk);
+		clk_disable_unprepare(info->sclk);
+		clk_disable_unprepare(info->mclk);
 	}
 }
 
-- 
2.26.2


WARNING: multiple messages have this Message-ID (diff)
From: Nikita Shubin <nikita.shubin@maquefel.me>
To: Alexander Sverdlin <alexander.sverdlin@gmail.com>,
	Geert Uytterhoeven <geert@linux-m68k.org>
Cc: "moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER
	MANAGEM..." <alsa-devel@alsa-project.org>,
	Nikita Shubin <nikita.shubin@maquefel.me>,
	Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
	open list <linux-kernel@vger.kernel.org>,
	Takashi Iwai <tiwai@suse.com>,
	Liam Girdwood <lgirdwood@gmail.com>,
	Mark Brown <broonie@kernel.org>
Subject: [PATCH v2 6/8] ASoC: cirrus: i2s: Prepare clock before using it
Date: Mon, 26 Jul 2021 16:59:54 +0300	[thread overview]
Message-ID: <20210726140001.24820-7-nikita.shubin@maquefel.me> (raw)
In-Reply-To: <20210726140001.24820-1-nikita.shubin@maquefel.me>

From: Alexander Sverdlin <alexander.sverdlin@gmail.com>

Use clk_prepare_enable()/clk_disable_unprepare() in preparation for switch
to Common Clock Framework, otherwise the following is visible:

WARNING: CPU: 0 PID: 97 at drivers/clk/clk.c:1011 clk_core_enable+0x9c/0xbc
Enabling unprepared mclk
...
Hardware name: Cirrus Logic EDB9302 Evaluation Board
...
clk_core_enable
clk_core_enable_lock
ep93xx_i2s_hw_params
snd_soc_dai_hw_params
soc_pcm_hw_params
snd_pcm_hw_params
snd_pcm_ioctl
...

Signed-off-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
Signed-off-by: Nikita Shubin <nikita.shubin@maquefel.me>
---
 sound/soc/cirrus/ep93xx-i2s.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/soc/cirrus/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c
index 0d26550d0df8..4d3179f03202 100644
--- a/sound/soc/cirrus/ep93xx-i2s.c
+++ b/sound/soc/cirrus/ep93xx-i2s.c
@@ -111,9 +111,9 @@ static void ep93xx_i2s_enable(struct ep93xx_i2s_info *info, int stream)
 	if ((ep93xx_i2s_read_reg(info, EP93XX_I2S_TX0EN) & 0x1) == 0 &&
 	    (ep93xx_i2s_read_reg(info, EP93XX_I2S_RX0EN) & 0x1) == 0) {
 		/* Enable clocks */
-		clk_enable(info->mclk);
-		clk_enable(info->sclk);
-		clk_enable(info->lrclk);
+		clk_prepare_enable(info->mclk);
+		clk_prepare_enable(info->sclk);
+		clk_prepare_enable(info->lrclk);
 
 		/* Enable i2s */
 		ep93xx_i2s_write_reg(info, EP93XX_I2S_GLCTRL, 1);
@@ -156,9 +156,9 @@ static void ep93xx_i2s_disable(struct ep93xx_i2s_info *info, int stream)
 		ep93xx_i2s_write_reg(info, EP93XX_I2S_GLCTRL, 0);
 
 		/* Disable clocks */
-		clk_disable(info->lrclk);
-		clk_disable(info->sclk);
-		clk_disable(info->mclk);
+		clk_disable_unprepare(info->lrclk);
+		clk_disable_unprepare(info->sclk);
+		clk_disable_unprepare(info->mclk);
 	}
 }
 
-- 
2.26.2


  parent reply	other threads:[~2021-07-26 14:01 UTC|newest]

Thread overview: 82+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-26 11:50 [PATCH 0/8] arm: ep93xx: CCF conversion Nikita Shubin
2021-07-26 11:50 ` Nikita Shubin
2021-07-26 11:50 ` Nikita Shubin
2021-07-26 11:50 ` Nikita Shubin
2021-07-26 11:50 ` [PATCH 1/8] iio: ep93xx: Prepare clock before using it Nikita Shubin
2021-07-26 11:50 ` [PATCH 2/8] spi: spi-ep93xx: " Nikita Shubin
2021-07-26 12:01   ` Mark Brown
2021-07-26 11:50 ` [PATCH 3/8] Input: ep93xx_keypad: " Nikita Shubin
2021-07-26 11:50 ` [PATCH 4/8] video: ep93xx: " Nikita Shubin
2021-07-26 11:50   ` Nikita Shubin
2021-07-26 11:50 ` [PATCH 5/8] dmaengine: " Nikita Shubin
2021-07-26 11:50 ` [PATCH 6/8] ASoC: cirrus: i2s: " Nikita Shubin
2021-07-26 11:50   ` Nikita Shubin
2021-07-26 11:50 ` [PATCH 7/8] pwm: ep93xx: " Nikita Shubin
2021-07-26 11:50 ` [PATCH 8/8] ep93xx: clock: convert in-place to COMMON_CLK Nikita Shubin
2021-07-26 11:50   ` Nikita Shubin
2021-07-26 11:57   ` Alexander Sverdlin
2021-07-26 11:57     ` Alexander Sverdlin
2021-07-26 13:59 ` [PATCH v2 0/8] arm: ep93xx: CCF conversion Nikita Shubin
2021-07-26 13:59   ` Nikita Shubin
2021-07-26 13:59   ` Nikita Shubin
2021-07-26 13:59   ` Nikita Shubin
2021-07-26 13:59   ` [PATCH v2 1/8] iio: ep93xx: Prepare clock before using it Nikita Shubin
2021-07-26 13:59   ` [PATCH v2 2/8] spi: spi-ep93xx: " Nikita Shubin
2021-07-26 16:51     ` Mark Brown
2021-08-02  7:36       ` Alexander Sverdlin
2021-09-13 21:36       ` Alexander Sverdlin
2021-09-13 21:37         ` Alexander Sverdlin
2021-09-14 10:32         ` Mark Brown
2021-07-26 13:59   ` [PATCH v2 3/8] Input: ep93xx_keypad: " Nikita Shubin
2021-07-26 13:59   ` [PATCH v2 4/8] video: ep93xx: " Nikita Shubin
2021-07-26 13:59     ` Nikita Shubin
2021-07-26 20:14     ` Sam Ravnborg
2021-07-26 13:59   ` [PATCH v2 5/8] dmaengine: " Nikita Shubin
2021-08-02  6:57     ` Vinod Koul
2021-07-26 13:59   ` Nikita Shubin [this message]
2021-07-26 13:59     ` [PATCH v2 6/8] ASoC: cirrus: i2s: " Nikita Shubin
2021-07-26 16:51     ` Mark Brown
2021-07-26 16:51       ` Mark Brown
2021-09-13 21:43       ` Alexander Sverdlin
2021-09-13 21:43         ` Alexander Sverdlin
2021-10-12  7:25         ` Alexander Sverdlin
2021-10-12  7:25           ` Alexander Sverdlin
2021-10-12 10:40           ` Mark Brown
2021-10-12 10:40             ` Mark Brown
2021-07-26 13:59   ` [PATCH v2 7/8] pwm: ep93xx: " Nikita Shubin
2021-07-26 13:59   ` [PATCH v2 8/8] ep93xx: clock: convert in-place to COMMON_CLK Nikita Shubin
2021-07-26 13:59     ` Nikita Shubin
2021-10-12  8:03     ` Alexander Sverdlin
2021-10-12  8:03       ` Alexander Sverdlin
2021-10-12  8:29       ` Arnd Bergmann
2021-10-12  8:29         ` Arnd Bergmann
2021-10-12  8:37         ` Alexander Sverdlin
2021-10-12  8:37           ` Alexander Sverdlin
2021-10-12  9:05           ` Arnd Bergmann
2021-10-12  9:05             ` Arnd Bergmann
2021-10-12 10:26             ` Mark Brown
2021-10-12 10:26               ` Mark Brown
2021-10-12 10:36               ` Alexander Sverdlin
2021-10-12 10:36                 ` Alexander Sverdlin
2021-10-12 10:43                 ` Mark Brown
2021-10-12 10:43                   ` Mark Brown
2021-10-12 11:03                   ` Alexander Sverdlin
2021-10-12 11:03                     ` Alexander Sverdlin
2021-10-12 11:21                     ` Mark Brown
2021-10-12 11:21                       ` Mark Brown
2021-10-12 11:26                       ` Alexander Sverdlin
2021-10-12 11:26                         ` Alexander Sverdlin
2021-10-12 11:30                         ` Geert Uytterhoeven
2021-10-12 11:30                           ` Geert Uytterhoeven
2021-10-12 12:39                           ` Arnd Bergmann
2021-10-12 12:39                             ` Arnd Bergmann
2021-10-12 12:57                             ` Alexander Sverdlin
2021-10-12 12:57                               ` Alexander Sverdlin
2021-10-15 22:32                           ` Mark Brown
2021-10-15 22:32                             ` Mark Brown
2021-08-03 22:35   ` (subset) [PATCH v2 0/8] arm: ep93xx: CCF conversion Mark Brown
2021-08-03 22:35     ` Mark Brown
2021-08-03 22:35     ` Mark Brown
2021-07-31 22:04 ` [PATCH " Linus Walleij
2021-07-31 22:04   ` Linus Walleij
2021-07-31 22:04   ` Linus Walleij

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=20210726140001.24820-7-nikita.shubin@maquefel.me \
    --to=nikita.shubin@maquefel.me \
    --cc=alexander.sverdlin@gmail.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=geert@linux-m68k.org \
    --cc=kuninori.morimoto.gx@renesas.com \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=perex@perex.cz \
    --cc=tiwai@suse.com \
    /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.