From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Lucas Tanure <tanureal@opensource.cirrus.com>,
Richard Fitzgerald <rf@opensource.cirrus.com>,
Mark Brown <broonie@sirena.org.uk>,
Sasha Levin <sashal@kernel.org>,
alsa-devel@alsa-project.org, patches@opensource.cirrus.com
Subject: [PATCH AUTOSEL 5.13 034/114] ASoC: cs42l42: Fix 1536000 Bit Clock instability
Date: Fri, 9 Jul 2021 22:16:28 -0400 [thread overview]
Message-ID: <20210710021748.3167666-34-sashal@kernel.org> (raw)
In-Reply-To: <20210710021748.3167666-1-sashal@kernel.org>
From: Lucas Tanure <tanureal@opensource.cirrus.com>
[ Upstream commit 1c52825c38fc4e44c61ed75a8ae32f5fa580383b ]
The 16 Bits, 2 channels, 48K sample rate use case needs
to configure a safer pll_divout during the start of PLL
After 800us from the start of PLL the correct pll_divout
can be set
Signed-off-by: Lucas Tanure <tanureal@opensource.cirrus.com>
Reviewed-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Message-Id: <20210525090822.64577-1-tanureal@opensource.cirrus.com>
Signed-off-by: Mark Brown <broonie@sirena.org.uk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
sound/soc/codecs/cs42l42.c | 47 +++++++++++++++++++++++++-------------
sound/soc/codecs/cs42l42.h | 2 ++
2 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c
index 77473c226f9e..8434c48354f1 100644
--- a/sound/soc/codecs/cs42l42.c
+++ b/sound/soc/codecs/cs42l42.c
@@ -581,6 +581,7 @@ struct cs42l42_pll_params {
u8 pll_divout;
u32 mclk_int;
u8 pll_cal_ratio;
+ u8 n;
};
/*
@@ -588,21 +589,21 @@ struct cs42l42_pll_params {
* Table 4-5 from the Datasheet
*/
static const struct cs42l42_pll_params pll_ratio_table[] = {
- { 1536000, 0, 1, 0x00, 0x7D, 0x000000, 0x03, 0x10, 12000000, 125 },
- { 2822400, 0, 1, 0x00, 0x40, 0x000000, 0x03, 0x10, 11289600, 128 },
- { 3000000, 0, 1, 0x00, 0x40, 0x000000, 0x03, 0x10, 12000000, 128 },
- { 3072000, 0, 1, 0x00, 0x3E, 0x800000, 0x03, 0x10, 12000000, 125 },
- { 4000000, 0, 1, 0x00, 0x30, 0x800000, 0x03, 0x10, 12000000, 96 },
- { 4096000, 0, 1, 0x00, 0x2E, 0xE00000, 0x03, 0x10, 12000000, 94 },
- { 5644800, 0, 1, 0x01, 0x40, 0x000000, 0x03, 0x10, 11289600, 128 },
- { 6000000, 0, 1, 0x01, 0x40, 0x000000, 0x03, 0x10, 12000000, 128 },
- { 6144000, 0, 1, 0x01, 0x3E, 0x800000, 0x03, 0x10, 12000000, 125 },
- { 11289600, 0, 0, 0, 0, 0, 0, 0, 11289600, 0 },
- { 12000000, 0, 0, 0, 0, 0, 0, 0, 12000000, 0 },
- { 12288000, 0, 0, 0, 0, 0, 0, 0, 12288000, 0 },
- { 22579200, 1, 0, 0, 0, 0, 0, 0, 22579200, 0 },
- { 24000000, 1, 0, 0, 0, 0, 0, 0, 24000000, 0 },
- { 24576000, 1, 0, 0, 0, 0, 0, 0, 24576000, 0 }
+ { 1536000, 0, 1, 0x00, 0x7D, 0x000000, 0x03, 0x10, 12000000, 125, 2},
+ { 2822400, 0, 1, 0x00, 0x40, 0x000000, 0x03, 0x10, 11289600, 128, 1},
+ { 3000000, 0, 1, 0x00, 0x40, 0x000000, 0x03, 0x10, 12000000, 128, 1},
+ { 3072000, 0, 1, 0x00, 0x3E, 0x800000, 0x03, 0x10, 12000000, 125, 1},
+ { 4000000, 0, 1, 0x00, 0x30, 0x800000, 0x03, 0x10, 12000000, 96, 1},
+ { 4096000, 0, 1, 0x00, 0x2E, 0xE00000, 0x03, 0x10, 12000000, 94, 1},
+ { 5644800, 0, 1, 0x01, 0x40, 0x000000, 0x03, 0x10, 11289600, 128, 1},
+ { 6000000, 0, 1, 0x01, 0x40, 0x000000, 0x03, 0x10, 12000000, 128, 1},
+ { 6144000, 0, 1, 0x01, 0x3E, 0x800000, 0x03, 0x10, 12000000, 125, 1},
+ { 11289600, 0, 0, 0, 0, 0, 0, 0, 11289600, 0, 1},
+ { 12000000, 0, 0, 0, 0, 0, 0, 0, 12000000, 0, 1},
+ { 12288000, 0, 0, 0, 0, 0, 0, 0, 12288000, 0, 1},
+ { 22579200, 1, 0, 0, 0, 0, 0, 0, 22579200, 0, 1},
+ { 24000000, 1, 0, 0, 0, 0, 0, 0, 24000000, 0, 1},
+ { 24576000, 1, 0, 0, 0, 0, 0, 0, 24576000, 0, 1}
};
static int cs42l42_pll_config(struct snd_soc_component *component)
@@ -738,8 +739,12 @@ static int cs42l42_pll_config(struct snd_soc_component *component)
snd_soc_component_update_bits(component,
CS42L42_PLL_CTL3,
CS42L42_PLL_DIVOUT_MASK,
- pll_ratio_table[i].pll_divout
+ (pll_ratio_table[i].pll_divout * pll_ratio_table[i].n)
<< CS42L42_PLL_DIVOUT_SHIFT);
+ if (pll_ratio_table[i].n != 1)
+ cs42l42->pll_divout = pll_ratio_table[i].pll_divout;
+ else
+ cs42l42->pll_divout = 0;
snd_soc_component_update_bits(component,
CS42L42_PLL_CAL_RATIO,
CS42L42_PLL_CAL_RATIO_MASK,
@@ -894,6 +899,16 @@ static int cs42l42_mute_stream(struct snd_soc_dai *dai, int mute, int stream)
if ((cs42l42->bclk < 11289600) && (cs42l42->sclk < 11289600)) {
snd_soc_component_update_bits(component, CS42L42_PLL_CTL1,
CS42L42_PLL_START_MASK, 1);
+
+ if (cs42l42->pll_divout) {
+ usleep_range(CS42L42_PLL_DIVOUT_TIME_US,
+ CS42L42_PLL_DIVOUT_TIME_US * 2);
+ snd_soc_component_update_bits(component, CS42L42_PLL_CTL3,
+ CS42L42_PLL_DIVOUT_MASK,
+ cs42l42->pll_divout <<
+ CS42L42_PLL_DIVOUT_SHIFT);
+ }
+
ret = regmap_read_poll_timeout(cs42l42->regmap,
CS42L42_PLL_LOCK_STATUS,
regval,
diff --git a/sound/soc/codecs/cs42l42.h b/sound/soc/codecs/cs42l42.h
index 36b763f0d1a0..be5fbf0df3e5 100644
--- a/sound/soc/codecs/cs42l42.h
+++ b/sound/soc/codecs/cs42l42.h
@@ -755,6 +755,7 @@
#define CS42L42_NUM_SUPPLIES 5
#define CS42L42_BOOT_TIME_US 3000
+#define CS42L42_PLL_DIVOUT_TIME_US 800
#define CS42L42_CLOCK_SWITCH_DELAY_US 150
#define CS42L42_PLL_LOCK_POLL_US 250
#define CS42L42_PLL_LOCK_TIMEOUT_US 1250
@@ -777,6 +778,7 @@ struct cs42l42_private {
int bclk;
u32 sclk;
u32 srate;
+ u8 pll_divout;
u8 plug_state;
u8 hs_type;
u8 ts_inv;
--
2.30.2
next prev parent reply other threads:[~2021-07-10 2:18 UTC|newest]
Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-10 2:15 [PATCH AUTOSEL 5.13 001/114] leds: tlc591xx: fix return value check in tlc591xx_probe() Sasha Levin
2021-07-10 2:15 ` [PATCH AUTOSEL 5.13 002/114] ASoC: Intel: sof_sdw: add mutual exclusion between PCH DMIC and RT715 Sasha Levin
2021-07-10 2:15 ` [PATCH AUTOSEL 5.13 003/114] ASoC: Intel: sof_sdw: add SOF_RT715_DAI_ID_FIX for AlderLake Sasha Levin
2021-07-10 2:15 ` [PATCH AUTOSEL 5.13 004/114] dmaengine: fsl-qdma: check dma_set_mask return value Sasha Levin
2021-07-10 2:15 ` [PATCH AUTOSEL 5.13 005/114] scsi: arcmsr: Fix the wrong CDB payload report to IOP Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 006/114] srcu: Fix broken node geometry after early ssp init Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 007/114] rcu: Reject RCU_LOCKDEP_WARN() false positives Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 008/114] soundwire: bus: only use CLOCK_STOP_MODE0 and fix confusions Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 009/114] soundwire: bus: handle -ENODATA errors in clock stop/start sequences Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 010/114] usb: dwc3: pci: Fix DEFINE for Intel Elkhart Lake Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 011/114] tty: serial: fsl_lpuart: fix the potential risk of division or modulo by zero Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 012/114] serial: fsl_lpuart: disable DMA for console and fix sysrq Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 013/114] serial: 8250: of: Check for CONFIG_SERIAL_8250_BCM7271 Sasha Levin
2021-07-10 2:33 ` Florian Fainelli
2021-07-18 0:39 ` Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 014/114] misc/libmasm/module: Fix two use after free in ibmasm_init_one Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 015/114] misc: alcor_pci: fix null-ptr-deref when there is no PCI bridge Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 016/114] ASoC: intel/boards: add missing MODULE_DEVICE_TABLE Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 017/114] partitions: msdos: fix one-byte get_unaligned() Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 018/114] iio: imu: st_lsm6dsx: correct ODR in header Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 019/114] iio: gyro: fxa21002c: Balance runtime pm + use pm_runtime_resume_and_get() Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 020/114] iio: magn: bmc150: " Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 021/114] ALSA: usx2y: Avoid camelCase Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 022/114] ALSA: usx2y: Don't call free_pages_exact() with NULL address Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 023/114] Revert "ALSA: bebob/oxfw: fix Kconfig entry for Mackie d.2 Pro" Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 024/114] usb: common: usb-conn-gpio: fix NULL pointer dereference of charger Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 025/114] ASoC: SOF: topology: fix assignment to use le32_to_cpu Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 026/114] w1: ds2438: fixing bug that would always get page0 Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 027/114] ASoC: Intel: sof_sdw: add quirk support for Brya and BT-offload Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 028/114] scsi: arcmsr: Fix doorbell status being updated late on ARC-1886 Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 029/114] scsi: hisi_sas: Propagate errors in interrupt_init_v1_hw() Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 030/114] scsi: lpfc: Fix "Unexpected timeout" error in direct attach topology Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 031/114] scsi: lpfc: Fix crash when lpfc_sli4_hba_setup() fails to initialize the SGLs Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 032/114] scsi: core: Cap scsi_host cmd_per_lun at can_queue Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 033/114] ALSA: ac97: fix PM reference leak in ac97_bus_remove() Sasha Levin
2021-07-10 2:16 ` Sasha Levin [this message]
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 035/114] tty: serial: 8250: serial_cs: Fix a memory leak in error handling path Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 036/114] scsi: mpt3sas: Fix deadlock while cancelling the running firmware event Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 037/114] scsi: core: Fixup calling convention for scsi_mode_sense() Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 038/114] scsi: scsi_dh_alua: Check for negative result value Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 039/114] fs/jfs: Fix missing error code in lmLogInit() Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 040/114] scsi: megaraid_sas: Fix resource leak in case of probe failure Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 041/114] scsi: megaraid_sas: Early detection of VD deletion through RaidMap update Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 042/114] scsi: megaraid_sas: Handle missing interrupts while re-enabling IRQs Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 043/114] scsi: iscsi: Stop queueing during ep_disconnect Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 044/114] scsi: iscsi: Add iscsi_cls_conn refcount helpers Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 045/114] scsi: iscsi: Fix conn use after free during resets Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 046/114] scsi: iscsi: Fix shost->max_id use Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 047/114] scsi: qedi: Fix null ref during abort handling Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 048/114] scsi: qedi: Fix race during abort timeouts Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 049/114] scsi: qedi: Fix TMF session block/unblock use Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 050/114] scsi: qedi: Fix cleanup " Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 051/114] mfd: da9052/stmpe: Add and modify MODULE_DEVICE_TABLE Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 052/114] mfd: cpcap: Fix cpcap dmamask not set warnings Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 053/114] char: xillybus: Fix condition for invoking the xillybus/ subdirectory Sasha Levin
2021-07-10 5:17 ` Eli Billauer
2021-07-18 0:43 ` Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 054/114] ASoC: img: Fix PM reference leak in img_i2s_in_probe() Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 055/114] iov_iter_advance(): use consistent semantics for move past the end Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 056/114] fsi: Add missing MODULE_DEVICE_TABLE Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 057/114] serial: tty: uartlite: fix console setup Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 058/114] s390/sclp_vt220: fix console name to match device Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 059/114] s390: disable SSP when needed Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 060/114] selftests: timers: rtcpie: skip test if default RTC device does not exist Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 061/114] iommu/arm-smmu-qcom: Skip the TTBR1 quirk for db820c Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 062/114] USB: core: Avoid WARNings for 0-length descriptor requests Sasha Levin
2021-07-10 6:23 ` Greg Kroah-Hartman
2021-07-18 0:44 ` Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 063/114] ALSA: sb: Fix potential double-free of CSP mixer elements Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 064/114] powerpc/ps3: Add dma_mask to ps3_dma_region Sasha Levin
2021-07-10 2:16 ` [PATCH AUTOSEL 5.13 065/114] iommu/arm-smmu: Fix arm_smmu_device refcount leak when arm_smmu_rpm_get fails Sasha Levin
2021-07-10 2:17 ` [PATCH AUTOSEL 5.13 066/114] iommu/arm-smmu: Fix arm_smmu_device refcount leak in address translation Sasha Levin
2021-07-10 2:17 ` [PATCH AUTOSEL 5.13 067/114] ALSA: n64: check return value after calling platform_get_resource() Sasha Levin
2021-07-10 2:17 ` [PATCH AUTOSEL 5.13 068/114] ALSA: control_led - fix initialization in the mode show callback Sasha Levin
2021-07-10 2:17 ` [PATCH AUTOSEL 5.13 069/114] ASoC: soc-pcm: fix the return value in dpcm_apply_symmetry() Sasha Levin
2021-07-10 2:17 ` [PATCH AUTOSEL 5.13 070/114] gpio: zynq: Check return value of pm_runtime_get_sync Sasha Levin
2021-07-10 2:17 ` [PATCH AUTOSEL 5.13 071/114] gpio: zynq: Check return value of irq_get_irq_data Sasha Levin
2021-07-10 2:17 ` [PATCH AUTOSEL 5.13 072/114] thunderbolt: Fix DROM handling for USB4 DROM Sasha Levin
2021-07-10 2:17 ` [PATCH AUTOSEL 5.13 073/114] powerpc/inst: Fix sparse detection on get_user_instr() Sasha Levin
2021-07-10 2:17 ` [PATCH AUTOSEL 5.13 074/114] scsi: storvsc: Correctly handle multiple flags in srb_status Sasha Levin
2021-07-10 2:17 ` [PATCH AUTOSEL 5.13 075/114] ALSA: ppc: fix error return code in snd_pmac_probe() 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=20210710021748.3167666-34-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@sirena.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@opensource.cirrus.com \
--cc=rf@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