From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Lucas Tanure <tanureal@opensource.cirrus.com>,
Mark Brown <broonie@kernel.org>, Sasha Levin <sashal@kernel.org>,
alsa-devel@alsa-project.org, patches@opensource.cirrus.com
Subject: [PATCH AUTOSEL 5.10 15/39] ASoC: cs42l42: Fix Bitclock polarity inversion
Date: Thu, 25 Mar 2021 07:25:34 -0400 [thread overview]
Message-ID: <20210325112558.1927423-15-sashal@kernel.org> (raw)
In-Reply-To: <20210325112558.1927423-1-sashal@kernel.org>
From: Lucas Tanure <tanureal@opensource.cirrus.com>
[ Upstream commit e793c965519b8b7f2fea51a48398405e2a501729 ]
The driver was setting bit clock polarity opposite to intended polarity.
Also simplify the code by grouping ADC and DAC clock configurations into
a single field.
Signed-off-by: Lucas Tanure <tanureal@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20210305173442.195740-2-tanureal@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
sound/soc/codecs/cs42l42.c | 20 ++++++++------------
sound/soc/codecs/cs42l42.h | 11 ++++++-----
2 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c
index 210fcbedf241..df0d5fec0287 100644
--- a/sound/soc/codecs/cs42l42.c
+++ b/sound/soc/codecs/cs42l42.c
@@ -797,27 +797,23 @@ static int cs42l42_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
/* Bitclock/frame inversion */
switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
case SND_SOC_DAIFMT_NB_NF:
+ asp_cfg_val |= CS42L42_ASP_SCPOL_NOR << CS42L42_ASP_SCPOL_SHIFT;
break;
case SND_SOC_DAIFMT_NB_IF:
- asp_cfg_val |= CS42L42_ASP_POL_INV <<
- CS42L42_ASP_LCPOL_IN_SHIFT;
+ asp_cfg_val |= CS42L42_ASP_SCPOL_NOR << CS42L42_ASP_SCPOL_SHIFT;
+ asp_cfg_val |= CS42L42_ASP_LCPOL_INV << CS42L42_ASP_LCPOL_SHIFT;
break;
case SND_SOC_DAIFMT_IB_NF:
- asp_cfg_val |= CS42L42_ASP_POL_INV <<
- CS42L42_ASP_SCPOL_IN_DAC_SHIFT;
break;
case SND_SOC_DAIFMT_IB_IF:
- asp_cfg_val |= CS42L42_ASP_POL_INV <<
- CS42L42_ASP_LCPOL_IN_SHIFT;
- asp_cfg_val |= CS42L42_ASP_POL_INV <<
- CS42L42_ASP_SCPOL_IN_DAC_SHIFT;
+ asp_cfg_val |= CS42L42_ASP_LCPOL_INV << CS42L42_ASP_LCPOL_SHIFT;
break;
}
- snd_soc_component_update_bits(component, CS42L42_ASP_CLK_CFG,
- CS42L42_ASP_MODE_MASK |
- CS42L42_ASP_SCPOL_IN_DAC_MASK |
- CS42L42_ASP_LCPOL_IN_MASK, asp_cfg_val);
+ snd_soc_component_update_bits(component, CS42L42_ASP_CLK_CFG, CS42L42_ASP_MODE_MASK |
+ CS42L42_ASP_SCPOL_MASK |
+ CS42L42_ASP_LCPOL_MASK,
+ asp_cfg_val);
return 0;
}
diff --git a/sound/soc/codecs/cs42l42.h b/sound/soc/codecs/cs42l42.h
index 9e3cc528dcff..1f0d67c95a9a 100644
--- a/sound/soc/codecs/cs42l42.h
+++ b/sound/soc/codecs/cs42l42.h
@@ -258,11 +258,12 @@
#define CS42L42_ASP_SLAVE_MODE 0x00
#define CS42L42_ASP_MODE_SHIFT 4
#define CS42L42_ASP_MODE_MASK (1 << CS42L42_ASP_MODE_SHIFT)
-#define CS42L42_ASP_SCPOL_IN_DAC_SHIFT 2
-#define CS42L42_ASP_SCPOL_IN_DAC_MASK (1 << CS42L42_ASP_SCPOL_IN_DAC_SHIFT)
-#define CS42L42_ASP_LCPOL_IN_SHIFT 0
-#define CS42L42_ASP_LCPOL_IN_MASK (1 << CS42L42_ASP_LCPOL_IN_SHIFT)
-#define CS42L42_ASP_POL_INV 1
+#define CS42L42_ASP_SCPOL_SHIFT 2
+#define CS42L42_ASP_SCPOL_MASK (3 << CS42L42_ASP_SCPOL_SHIFT)
+#define CS42L42_ASP_SCPOL_NOR 3
+#define CS42L42_ASP_LCPOL_SHIFT 0
+#define CS42L42_ASP_LCPOL_MASK (3 << CS42L42_ASP_LCPOL_SHIFT)
+#define CS42L42_ASP_LCPOL_INV 3
#define CS42L42_ASP_FRM_CFG (CS42L42_PAGE_12 + 0x08)
#define CS42L42_ASP_STP_SHIFT 4
--
2.30.1
next prev parent reply other threads:[~2021-03-25 11:27 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-25 11:25 [PATCH AUTOSEL 5.10 01/39] virtiofs: Fail dax mount if device does not support it Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 02/39] ext4: shrink race window in ext4_should_retry_alloc() Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 03/39] ext4: add reclaim checks to xattr code Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 04/39] fs/ext4: fix integer overflow in s_log_groups_per_flex Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 05/39] ext4: fix bh ref count on error paths Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 06/39] fs: nfsd: fix kconfig dependency warning for NFSD_V4 Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 07/39] rpc: fix NULL dereference on kmalloc failure Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 08/39] iomap: Fix negative assignment to unsigned sis->pages in iomap_swapfile_activate Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 09/39] ASoC: rt1015: fix i2c communication error Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 10/39] ASoC: rt5640: Fix dac- and adc- vol-tlv values being off by a factor of 10 Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 11/39] ASoC: rt5651: " Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 12/39] ASoC: sgtl5000: set DAP_AVC_CTRL register to correct default value on probe Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 13/39] ASoC: es8316: Simplify adc_pga_gain_tlv table Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 14/39] ASoC: soc-core: Prevent warning if no DMI table is present Sasha Levin
2021-03-25 11:25 ` Sasha Levin [this message]
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 16/39] ASoC: cs42l42: Fix channel width support Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 17/39] ASoC: cs42l42: Fix mixer volume control Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 18/39] ASoC: cs42l42: Always wait at least 3ms after reset Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 19/39] NFSD: fix error handling in NFSv4.0 callbacks Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 20/39] kernel: freezer should treat PF_IO_WORKER like PF_KTHREAD for freezing Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 21/39] powerpc: Force inlining of cpu_has_feature() to avoid build failure Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 22/39] vhost: Fix vhost_vq_reset() Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 23/39] io_uring: fix ->flags races by linked timeouts Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 24/39] scsi: st: Fix a use after free in st_open() Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 25/39] scsi: qla2xxx: Fix broken #endif placement Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 26/39] staging: comedi: cb_pcidas: fix request_irq() warn Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 27/39] staging: comedi: cb_pcidas64: " Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 28/39] ASoC: rt5659: Update MCLK rate in set_sysclk() Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 29/39] ASoC: rt711: add snd_soc_component remove callback Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 30/39] thermal/core: Add NULL pointer check before using cooling device stats Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 31/39] locking/ww_mutex: Simplify use_ww_ctx & ww_ctx handling Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 32/39] locking/ww_mutex: Fix acquire/release imbalance in ww_acquire_init()/ww_acquire_fini() Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 33/39] nvmet-tcp: fix kmap leak when data digest in use Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 34/39] io_uring: imply MSG_NOSIGNAL for send[msg]()/recv[msg]() calls Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 35/39] static_call: Align static_call_is_init() patching condition Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 36/39] ext4: do not iput inode under running transaction in ext4_rename() Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 37/39] signal: don't allow sending any signals to PF_IO_WORKER threads Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 38/39] signal: don't allow STOP on " Sasha Levin
2021-03-25 11:25 ` [PATCH AUTOSEL 5.10 39/39] io_uring: call req_set_fail_links() on short send[msg]()/recv[msg]() with MSG_WAITALL 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=20210325112558.1927423-15-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@opensource.cirrus.com \
--cc=stable@vger.kernel.org \
--cc=tanureal@opensource.cirrus.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