From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: <mturquette@baylibre.com>, <sboyd@codeaurora.org>,
<tony@atomide.com>, <lee.jones@linaro.org>, <robh+dt@kernel.org>,
<lgirdwood@gmail.com>, <broonie@kernel.org>
Cc: <t-kristo@ti.com>, <linux-kernel@vger.kernel.org>,
<linux-clk@vger.kernel.org>, <linux-omap@vger.kernel.org>,
<devicetree@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<alsa-devel@alsa-project.org>
Subject: [PATCH v1 12/14] ASoC: omap-mcpdm: Move the WD enable write inside omap_mcpdm_open_streams()
Date: Mon, 30 May 2016 11:55:20 +0300 [thread overview]
Message-ID: <20160530085522.30398-13-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <20160530085522.30398-1-peter.ujfalusi@ti.com>
The DS4_WD_EN bit is only touched before calling omap_mcpdm_open_streams().
Move it inside of that function for simplicity.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
sound/soc/omap/omap-mcpdm.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index b837265ac3e9..11bd07cdce22 100644
--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@ -173,6 +173,10 @@ static inline int omap_mcpdm_active(struct omap_mcpdm *mcpdm)
*/
static void omap_mcpdm_open_streams(struct omap_mcpdm *mcpdm)
{
+ u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_REG_CTRL);
+
+ omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, ctrl | MCPDM_WD_EN);
+
omap_mcpdm_write(mcpdm, MCPDM_REG_IRQENABLE_SET,
MCPDM_DN_IRQ_EMPTY | MCPDM_DN_IRQ_FULL |
MCPDM_UP_IRQ_EMPTY | MCPDM_UP_IRQ_FULL);
@@ -258,12 +262,9 @@ static int omap_mcpdm_dai_startup(struct snd_pcm_substream *substream,
mutex_lock(&mcpdm->mutex);
- if (!dai->active) {
- u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_REG_CTRL);
-
- omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, ctrl | MCPDM_WD_EN);
+ if (!dai->active)
omap_mcpdm_open_streams(mcpdm);
- }
+
mutex_unlock(&mcpdm->mutex);
return 0;
--
2.8.3
WARNING: multiple messages have this Message-ID (diff)
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: mturquette@baylibre.com, sboyd@codeaurora.org, tony@atomide.com,
lee.jones@linaro.org, robh+dt@kernel.org, lgirdwood@gmail.com,
broonie@kernel.org
Cc: t-kristo@ti.com, linux-kernel@vger.kernel.org,
linux-clk@vger.kernel.org, linux-omap@vger.kernel.org,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
alsa-devel@alsa-project.org
Subject: [PATCH v1 12/14] ASoC: omap-mcpdm: Move the WD enable write inside omap_mcpdm_open_streams()
Date: Mon, 30 May 2016 11:55:20 +0300 [thread overview]
Message-ID: <20160530085522.30398-13-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <20160530085522.30398-1-peter.ujfalusi@ti.com>
The DS4_WD_EN bit is only touched before calling omap_mcpdm_open_streams().
Move it inside of that function for simplicity.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
sound/soc/omap/omap-mcpdm.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index b837265ac3e9..11bd07cdce22 100644
--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@ -173,6 +173,10 @@ static inline int omap_mcpdm_active(struct omap_mcpdm *mcpdm)
*/
static void omap_mcpdm_open_streams(struct omap_mcpdm *mcpdm)
{
+ u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_REG_CTRL);
+
+ omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, ctrl | MCPDM_WD_EN);
+
omap_mcpdm_write(mcpdm, MCPDM_REG_IRQENABLE_SET,
MCPDM_DN_IRQ_EMPTY | MCPDM_DN_IRQ_FULL |
MCPDM_UP_IRQ_EMPTY | MCPDM_UP_IRQ_FULL);
@@ -258,12 +262,9 @@ static int omap_mcpdm_dai_startup(struct snd_pcm_substream *substream,
mutex_lock(&mcpdm->mutex);
- if (!dai->active) {
- u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_REG_CTRL);
-
- omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, ctrl | MCPDM_WD_EN);
+ if (!dai->active)
omap_mcpdm_open_streams(mcpdm);
- }
+
mutex_unlock(&mcpdm->mutex);
return 0;
--
2.8.3
WARNING: multiple messages have this Message-ID (diff)
From: peter.ujfalusi@ti.com (Peter Ujfalusi)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v1 12/14] ASoC: omap-mcpdm: Move the WD enable write inside omap_mcpdm_open_streams()
Date: Mon, 30 May 2016 11:55:20 +0300 [thread overview]
Message-ID: <20160530085522.30398-13-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <20160530085522.30398-1-peter.ujfalusi@ti.com>
The DS4_WD_EN bit is only touched before calling omap_mcpdm_open_streams().
Move it inside of that function for simplicity.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
sound/soc/omap/omap-mcpdm.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index b837265ac3e9..11bd07cdce22 100644
--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@ -173,6 +173,10 @@ static inline int omap_mcpdm_active(struct omap_mcpdm *mcpdm)
*/
static void omap_mcpdm_open_streams(struct omap_mcpdm *mcpdm)
{
+ u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_REG_CTRL);
+
+ omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, ctrl | MCPDM_WD_EN);
+
omap_mcpdm_write(mcpdm, MCPDM_REG_IRQENABLE_SET,
MCPDM_DN_IRQ_EMPTY | MCPDM_DN_IRQ_FULL |
MCPDM_UP_IRQ_EMPTY | MCPDM_UP_IRQ_FULL);
@@ -258,12 +262,9 @@ static int omap_mcpdm_dai_startup(struct snd_pcm_substream *substream,
mutex_lock(&mcpdm->mutex);
- if (!dai->active) {
- u32 ctrl = omap_mcpdm_read(mcpdm, MCPDM_REG_CTRL);
-
- omap_mcpdm_write(mcpdm, MCPDM_REG_CTRL, ctrl | MCPDM_WD_EN);
+ if (!dai->active)
omap_mcpdm_open_streams(mcpdm);
- }
+
mutex_unlock(&mcpdm->mutex);
return 0;
--
2.8.3
next prev parent reply other threads:[~2016-05-30 8:57 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-30 8:55 [PATCH v1 00/14] clk/mfd/ASoC/ARM: OMAP4/5: McPDM/twl6040 pdmclk support Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
2016-05-30 8:55 ` [PATCH v1 01/14] clk: twl6040: Correct clk_ops Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
2016-08-15 19:10 ` Stephen Boyd
2016-08-15 19:10 ` Stephen Boyd
2016-05-30 8:55 ` [PATCH v1 02/14] clk: twl6040: Register the clock as of_clk_provider Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
2016-08-15 19:10 ` Stephen Boyd
2016-08-15 19:10 ` Stephen Boyd
2016-05-30 8:55 ` [PATCH v1 03/14] clk: twl6040: Rename the driver and use consistent names in the code Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
2016-08-15 19:10 ` Stephen Boyd
2016-08-15 19:10 ` Stephen Boyd
2016-08-15 19:10 ` Stephen Boyd
2016-05-30 8:55 ` [PATCH v1 04/14] mfd: twl6040: The chip does not support bulk access Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
2016-05-30 8:55 ` [PATCH v1 05/14] mfd: twl6040: Register child device for twl6040-pdmclk Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
2016-05-30 8:55 ` [PATCH v1 06/14] ARM: dts: omap5-board-common: Add pdmclk binding for audio Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
2016-06-10 11:36 ` Tony Lindgren
2016-06-10 11:36 ` Tony Lindgren
2016-06-10 11:36 ` Tony Lindgren
2016-05-30 8:55 ` [PATCH v1 07/14] ARM: dts: omap4-panda-common: " Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
2016-05-30 8:55 ` [PATCH v1 08/14] ARM: dts: omap4-sdp: " Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
2016-05-30 8:55 ` [PATCH v1 09/14] ARM: dts: omap4-var-som-om44: " Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
2016-05-30 8:55 ` [PATCH v1 10/14] ARM: dts: omap4-duovero: " Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
2016-05-30 8:55 ` [PATCH v1 11/14] ASoC: omap: Kconfig: SND_OMAP_SOC_OMAP_ABE_TWL6040 to select CLK_TWL6040 Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
2016-05-30 16:15 ` Mark Brown
2016-05-30 16:15 ` Mark Brown
2016-05-30 8:55 ` Peter Ujfalusi [this message]
2016-05-30 8:55 ` [PATCH v1 12/14] ASoC: omap-mcpdm: Move the WD enable write inside omap_mcpdm_open_streams() Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
2016-05-30 8:55 ` [PATCH v1 13/14] ASoC: omap-mcpdm: Support for suspend resume Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
2016-05-30 8:55 ` [PATCH v1 14/14] ASoC: omap-mcpdm: Add support for pdmclk clock handling Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
2016-05-30 8:55 ` Peter Ujfalusi
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=20160530085522.30398-13-peter.ujfalusi@ti.com \
--to=peter.ujfalusi@ti.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=lee.jones@linaro.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=robh+dt@kernel.org \
--cc=sboyd@codeaurora.org \
--cc=t-kristo@ti.com \
--cc=tony@atomide.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.