summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Hancock <robert.hancock@calian.com>2021-03-25 13:26:39 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-07-14 16:53:35 +0200
commit71721ddf4aee271af6e1d7682da6a90a76ccd5a5 (patch)
tree109a8cc6d2cc4d9bd9b0c62075c08c651421c506
parentf894ba756e8637cfbf943ca4f51cfcd2b3392498 (diff)
downloadlinux-stable-71721ddf4aee271af6e1d7682da6a90a76ccd5a5.tar.gz
linux-stable-71721ddf4aee271af6e1d7682da6a90a76ccd5a5.tar.bz2
linux-stable-71721ddf4aee271af6e1d7682da6a90a76ccd5a5.zip
clk: si5341: Update initialization magic
[ Upstream commit 3c9b49b0031aefb81adfdba5ab0ddf3ca3a2cdc9 ] Update the default register settings to include the VCO_RESET_CALCODE settings (set by the SiLabs ClockBuilder software but not described in the datasheet). Also update part of the initialization sequence to match ClockBuilder and the datasheet. Fixes: 3044a860fd ("clk: Add Si5341/Si5340 driver") Signed-off-by: Robert Hancock <robert.hancock@calian.com> Link: https://lore.kernel.org/r/20210325192643.2190069-6-robert.hancock@calian.com Signed-off-by: Stephen Boyd <sboyd@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/clk/clk-si5341.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/clk/clk-si5341.c b/drivers/clk/clk-si5341.c
index ae8960188826..8f9f3d4a54fd 100644
--- a/drivers/clk/clk-si5341.c
+++ b/drivers/clk/clk-si5341.c
@@ -304,6 +304,8 @@ static const struct si5341_reg_default si5341_reg_defaults[] = {
{ 0x094A, 0x00 }, /* INx_TO_PFD_EN (disabled) */
{ 0x0A02, 0x00 }, /* Not in datasheet */
{ 0x0B44, 0x0F }, /* PDIV_ENB (datasheet does not mention what it is) */
+ { 0x0B57, 0x10 }, /* VCO_RESET_CALCODE (not described in datasheet) */
+ { 0x0B58, 0x05 }, /* VCO_RESET_CALCODE (not described in datasheet) */
};
/* Read and interpret a 44-bit followed by a 32-bit value in the regmap */
@@ -935,7 +937,7 @@ static const struct si5341_reg_default si5341_preamble[] = {
{ 0x0B25, 0x00 },
{ 0x0502, 0x01 },
{ 0x0505, 0x03 },
- { 0x0957, 0x1F },
+ { 0x0957, 0x17 },
{ 0x0B4E, 0x1A },
};