From: Michael Sit Wei Hong <michael.wei.hong.sit@intel.com>
To: alsa-devel@alsa-project.org
Cc: cezary.rojewski@intel.com, andriy.shevchenko@intel.com,
tiwai@suse.com, jee.heng.sia@intel.com,
pierre-louis.bossart@linux.intel.com,
liam.r.girdwood@linux.intel.com, broonie@kernel.org
Subject: [PATCH 2/4] ASoC: Intel: KMB: Rework disable channel function
Date: Thu, 30 Jul 2020 13:53:17 +0800 [thread overview]
Message-ID: <20200730055319.1522-3-michael.wei.hong.sit@intel.com> (raw)
In-Reply-To: <20200730055319.1522-1-michael.wei.hong.sit@intel.com>
All channels are enabled at boot up, this patch ensures that all
channels are disabled at boot and whenever the function is called.
Signed-off-by: Michael Sit Wei Hong <michael.wei.hong.sit@intel.com>
Reviewed-by: Sia Jee Heng <jee.heng.sia@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
sound/soc/intel/keembay/kmb_platform.c | 10 +++++++---
sound/soc/intel/keembay/kmb_platform.h | 1 +
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/sound/soc/intel/keembay/kmb_platform.c b/sound/soc/intel/keembay/kmb_platform.c
index f94eb5b7598d..eaa4fd391171 100644
--- a/sound/soc/intel/keembay/kmb_platform.c
+++ b/sound/soc/intel/keembay/kmb_platform.c
@@ -109,14 +109,14 @@ static unsigned int kmb_pcm_rx_fn(struct kmb_i2s_info *kmb_i2s,
static inline void kmb_i2s_disable_channels(struct kmb_i2s_info *kmb_i2s,
u32 stream)
{
- struct i2s_clk_config_data *config = &kmb_i2s->config;
u32 i;
+ /* Disable all channels regardless of configuration*/
if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
- for (i = 0; i < config->chan_nr / 2; i++)
+ for (i = 0; i < MAX_ISR; i++)
writel(0, kmb_i2s->i2s_base + TER(i));
} else {
- for (i = 0; i < config->chan_nr / 2; i++)
+ for (i = 0; i < MAX_ISR; i++)
writel(0, kmb_i2s->i2s_base + RER(i));
}
}
@@ -637,6 +637,10 @@ static int kmb_plat_dai_probe(struct platform_device *pdev)
return ret;
}
+ /* To ensure none of the channels are enabled at boot up */
+ kmb_i2s_disable_channels(kmb_i2s, SNDRV_PCM_STREAM_PLAYBACK);
+ kmb_i2s_disable_channels(kmb_i2s, SNDRV_PCM_STREAM_CAPTURE);
+
dev_set_drvdata(dev, kmb_i2s);
return ret;
diff --git a/sound/soc/intel/keembay/kmb_platform.h b/sound/soc/intel/keembay/kmb_platform.h
index 29600652d8f4..da522b366995 100644
--- a/sound/soc/intel/keembay/kmb_platform.h
+++ b/sound/soc/intel/keembay/kmb_platform.h
@@ -90,6 +90,7 @@
#define MAX_CHANNEL_NUM 8
#define MIN_CHANNEL_NUM 2
+#define MAX_ISR 4
#define TWO_CHANNEL_SUPPORT 2 /* up to 2.0 */
#define FOUR_CHANNEL_SUPPORT 4 /* up to 3.1 */
--
2.17.1
next prev parent reply other threads:[~2020-07-30 6:01 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-30 5:53 [PATCH 0/4] ASoC: Intel: KMB: TDM Enablement patches Michael Sit Wei Hong
2020-07-30 5:53 ` [PATCH 1/4] ASoC: Intel: KMB: Add 8kHz audio support Michael Sit Wei Hong
2020-07-30 5:53 ` Michael Sit Wei Hong [this message]
2020-07-30 5:53 ` [PATCH 3/4] ASoC: Intel: KMB: Enable TDM audio capture Michael Sit Wei Hong
2020-07-30 5:53 ` [PATCH 4/4] dt-bindings: sound: intel, keembay-i2s: Add channel-max property Michael Sit Wei Hong
2020-07-30 11:29 ` [PATCH 4/4] dt-bindings: sound: intel,keembay-i2s: " Mark Brown
2020-08-03 1:59 ` Sit, Michael Wei Hong
2020-08-03 10:49 ` Mark Brown
2020-08-04 1:57 ` Sit, Michael Wei Hong
2020-08-04 11:50 ` Mark Brown
2020-08-05 6:21 ` Sit, Michael Wei Hong
2020-08-07 14:31 ` Mark Brown
2020-08-10 9:47 ` Sit, Michael Wei Hong
2020-08-10 12:26 ` Mark Brown
2020-07-30 22:28 ` [PATCH 0/4] ASoC: Intel: KMB: TDM Enablement patches Mark Brown
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=20200730055319.1522-3-michael.wei.hong.sit@intel.com \
--to=michael.wei.hong.sit@intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=andriy.shevchenko@intel.com \
--cc=broonie@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=jee.heng.sia@intel.com \
--cc=liam.r.girdwood@linux.intel.com \
--cc=pierre-louis.bossart@linux.intel.com \
--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 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).