From: Sasha Levin <sashal@kernel.org> To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alexander Shiyan <shc_work@mail.ru>, Nicolin Chen <nicoleotsuka@gmail.com>, Mark Brown <broonie@kernel.org>, Sasha Levin <sashal@kernel.org>, alsa-devel@alsa-project.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH AUTOSEL 4.9 08/23] ASoC: fsl_esai: Fix TDM slot setup for I2S mode Date: Mon, 12 Apr 2021 12:26:49 -0400 [thread overview] Message-ID: <20210412162704.315783-8-sashal@kernel.org> (raw) In-Reply-To: <20210412162704.315783-1-sashal@kernel.org> From: Alexander Shiyan <shc_work@mail.ru> [ Upstream commit e7a48c710defa0e0fef54d42b7d9e4ab596e2761 ] When using the driver in I2S TDM mode, the fsl_esai_startup() function rewrites the number of slots previously set by the fsl_esai_set_dai_tdm_slot() function to 2. To fix this, let's use the saved slot count value or, if TDM is not used and the number of slots is not set, the driver will use the default value (2), which is set by fsl_esai_probe(). Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Acked-by: Nicolin Chen <nicoleotsuka@gmail.com> Link: https://lore.kernel.org/r/20210402081405.9892-1-shc_work@mail.ru Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> --- sound/soc/fsl/fsl_esai.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index fa64cc2b1729..94bf497092b2 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -495,11 +495,13 @@ static int fsl_esai_startup(struct snd_pcm_substream *substream, ESAI_SAICR_SYNC, esai_priv->synchronous ? ESAI_SAICR_SYNC : 0); - /* Set a default slot number -- 2 */ + /* Set slots count */ regmap_update_bits(esai_priv->regmap, REG_ESAI_TCCR, - ESAI_xCCR_xDC_MASK, ESAI_xCCR_xDC(2)); + ESAI_xCCR_xDC_MASK, + ESAI_xCCR_xDC(esai_priv->slots)); regmap_update_bits(esai_priv->regmap, REG_ESAI_RCCR, - ESAI_xCCR_xDC_MASK, ESAI_xCCR_xDC(2)); + ESAI_xCCR_xDC_MASK, + ESAI_xCCR_xDC(esai_priv->slots)); } return 0; -- 2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: Sasha Levin <sashal@kernel.org> To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin <sashal@kernel.org>, alsa-devel@alsa-project.org, Alexander Shiyan <shc_work@mail.ru>, Nicolin Chen <nicoleotsuka@gmail.com>, Mark Brown <broonie@kernel.org>, linuxppc-dev@lists.ozlabs.org Subject: [PATCH AUTOSEL 4.9 08/23] ASoC: fsl_esai: Fix TDM slot setup for I2S mode Date: Mon, 12 Apr 2021 12:26:49 -0400 [thread overview] Message-ID: <20210412162704.315783-8-sashal@kernel.org> (raw) In-Reply-To: <20210412162704.315783-1-sashal@kernel.org> From: Alexander Shiyan <shc_work@mail.ru> [ Upstream commit e7a48c710defa0e0fef54d42b7d9e4ab596e2761 ] When using the driver in I2S TDM mode, the fsl_esai_startup() function rewrites the number of slots previously set by the fsl_esai_set_dai_tdm_slot() function to 2. To fix this, let's use the saved slot count value or, if TDM is not used and the number of slots is not set, the driver will use the default value (2), which is set by fsl_esai_probe(). Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Acked-by: Nicolin Chen <nicoleotsuka@gmail.com> Link: https://lore.kernel.org/r/20210402081405.9892-1-shc_work@mail.ru Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> --- sound/soc/fsl/fsl_esai.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index fa64cc2b1729..94bf497092b2 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -495,11 +495,13 @@ static int fsl_esai_startup(struct snd_pcm_substream *substream, ESAI_SAICR_SYNC, esai_priv->synchronous ? ESAI_SAICR_SYNC : 0); - /* Set a default slot number -- 2 */ + /* Set slots count */ regmap_update_bits(esai_priv->regmap, REG_ESAI_TCCR, - ESAI_xCCR_xDC_MASK, ESAI_xCCR_xDC(2)); + ESAI_xCCR_xDC_MASK, + ESAI_xCCR_xDC(esai_priv->slots)); regmap_update_bits(esai_priv->regmap, REG_ESAI_RCCR, - ESAI_xCCR_xDC_MASK, ESAI_xCCR_xDC(2)); + ESAI_xCCR_xDC_MASK, + ESAI_xCCR_xDC(esai_priv->slots)); } return 0; -- 2.30.2
next prev parent reply other threads:[~2021-04-12 16:47 UTC|newest] Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-12 16:26 [PATCH AUTOSEL 4.9 01/23] net: ieee802154: nl-mac: fix check on panid Sasha Levin 2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 02/23] ARM: dts: Fix moving mmc devices with aliases for omap4 & 5 Sasha Levin 2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 03/23] arc: kernel: Return -EFAULT if copy_to_user() fails Sasha Levin 2021-04-12 16:26 ` Sasha Levin 2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 04/23] neighbour: Disregard DEAD dst in neigh_update Sasha Levin 2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 05/23] ARM: keystone: fix integer overflow warning Sasha Levin 2021-04-12 16:26 ` Sasha Levin 2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 06/23] drivers: net: fix memory leak in atusb_probe Sasha Levin 2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 07/23] drivers: net: fix memory leak in peak_usb_create_dev Sasha Levin 2021-04-12 16:26 ` Sasha Levin [this message] 2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 08/23] ASoC: fsl_esai: Fix TDM slot setup for I2S mode Sasha Levin 2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 09/23] net: ieee802154: forbid monitor for set llsec params Sasha Levin 2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 10/23] net: ieee802154: stop dump llsec keys for monitors Sasha Levin 2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 11/23] net: ieee802154: stop dump llsec devs " Sasha Levin 2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 12/23] net: ieee802154: forbid monitor for add llsec dev Sasha Levin 2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 13/23] net: ieee802154: stop dump llsec devkeys for monitors Sasha Levin 2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 14/23] net: ieee802154: forbid monitor for add llsec devkey Sasha Levin 2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 15/23] net: ieee802154: stop dump llsec seclevels for monitors Sasha Levin 2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 16/23] net: ieee802154: forbid monitor for add llsec seclevel Sasha Levin 2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 17/23] net: ieee802154: forbid monitor for del " Sasha Levin 2021-04-12 16:26 ` [PATCH AUTOSEL 4.9 18/23] net: ieee802154: stop dump llsec params for monitors Sasha Levin 2021-04-12 16:27 ` [PATCH AUTOSEL 4.9 19/23] net: mac802154: Fix general protection fault Sasha Levin 2021-04-12 16:27 ` [PATCH AUTOSEL 4.9 20/23] pcnet32: Use pci_resource_len to validate PCI resource Sasha Levin 2021-04-12 16:27 ` Sasha Levin 2021-04-12 16:27 ` [PATCH AUTOSEL 4.9 21/23] net/rds: Avoid potential use after free in rds_send_remove_from_sock Sasha Levin 2021-04-12 16:27 ` [PATCH AUTOSEL 4.9 22/23] net: tipc: Fix spelling errors in net/tipc module Sasha Levin 2021-04-12 16:27 ` [PATCH AUTOSEL 4.9 23/23] cfg80211: remove WARN_ON() in cfg80211_sme_connect Sasha Levin
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=20210412162704.315783-8-sashal@kernel.org \ --to=sashal@kernel.org \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=nicoleotsuka@gmail.com \ --cc=shc_work@mail.ru \ --cc=stable@vger.kernel.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: linkBe 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.