From: Robert Hancock <robert.hancock@calian.com>
To: mturquette@baylibre.com, sboyd@kernel.org
Cc: mike.looijmans@topic.nl, devicetree@vger.kernel.org,
linux-clk@vger.kernel.org,
Robert Hancock <robert.hancock@calian.com>
Subject: [PATCH 2/9] clk: si5341: Wait for DEVICE_READY on startup
Date: Thu, 11 Mar 2021 16:24:29 -0600 [thread overview]
Message-ID: <20210311222436.3826800-3-robert.hancock@calian.com> (raw)
In-Reply-To: <20210311222436.3826800-1-robert.hancock@calian.com>
The Si5341 datasheet warns that before accessing any other registers,
including the PAGE register, we need to wait for the DEVICE_READY register
to indicate the device is ready, or the process of the device loading its
state from NVM can be corrupted. Wait for DEVICE_READY on startup before
continuing initialization. This is done using a raw I2C register read
prior to setting up regmap to avoid any potential unwanted automatic PAGE
register accesses from regmap at this stage.
Fixes: 3044a860fd ("clk: Add Si5341/Si5340 driver")
Signed-off-by: Robert Hancock <robert.hancock@calian.com>
---
drivers/clk/clk-si5341.c | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/drivers/clk/clk-si5341.c b/drivers/clk/clk-si5341.c
index e0446e66fa64..f210860fb96e 100644
--- a/drivers/clk/clk-si5341.c
+++ b/drivers/clk/clk-si5341.c
@@ -94,6 +94,7 @@ struct clk_si5341_output_config {
#define SI5341_STATUS 0x000C
#define SI5341_SOFT_RST 0x001C
#define SI5341_IN_SEL 0x0021
+#define SI5341_DEVICE_READY 0x00FE
#define SI5341_XAXB_CFG 0x090E
#define SI5341_IN_EN 0x0949
#define SI5341_INX_TO_PFD_EN 0x094A
@@ -1189,6 +1190,31 @@ static const struct regmap_range_cfg si5341_regmap_ranges[] = {
},
};
+static int si5341_wait_device_ready(struct i2c_client *client)
+{
+ int count;
+
+ /* Datasheet warns: Any attempt to read or write any register other
+ * than DEVICE_READY before DEVICE_READY reads as 0x0F may corrupt the
+ * NVM programming and may corrupt the register contents, as they are
+ * read from NVM. Note that this includes accesses to the PAGE register.
+ * Also: DEVICE_READY is available on every register page, so no page
+ * change is needed to read it.
+ * Do this outside regmap to avoid automatic PAGE register access.
+ */
+ for (count = 0; count < 10; ++count) {
+ s32 result = i2c_smbus_read_byte_data(client,
+ SI5341_DEVICE_READY);
+ if (result < 0)
+ return result;
+ if (result == 0x0F)
+ return 0;
+ usleep_range(1000, 20000);
+ }
+ dev_err(&client->dev, "timeout waiting for DEVICE_READY\n");
+ return -EIO;
+}
+
static const struct regmap_config si5341_regmap_config = {
.reg_bits = 8,
.val_bits = 8,
@@ -1385,6 +1411,11 @@ static int si5341_probe(struct i2c_client *client,
data->i2c_client = client;
+ /* Must be done before otherwise touching hardware */
+ err = si5341_wait_device_ready(client);
+ if (err)
+ return err;
+
for (i = 0; i < SI5341_NUM_INPUTS; ++i) {
input = devm_clk_get(&client->dev, si5341_input_clock_names[i]);
if (IS_ERR(input)) {
--
2.27.0
next prev parent reply other threads:[~2021-03-11 22:25 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-11 22:24 [PATCH 0/9] Si5341 driver updates Robert Hancock
[not found] ` <1b153bce-a66a-45ee-a5c6-963ea6fb1c82.949ef384-8293-46b8-903f-40a477c056ae.9334a909-9494-43d0-954a-ed0ddcbb7b5d@emailsignatures365.codetwo.com>
[not found] ` <1b153bce-a66a-45ee-a5c6-963ea6fb1c82.949ef384-8293-46b8-903f-40a477c056ae.b1dc66c0-d7df-44f1-9f1a-e729e77f49c2@emailsignatures365.codetwo.com>
[not found] ` <1b153bce-a66a-45ee-a5c6-963ea6fb1c82.949ef384-8293-46b8-903f-40a477c056ae.a5c64a18-101d-4705-9716-1c41c644d43a@emailsignatures365.codetwo.com>
2021-03-11 22:24 ` [PATCH 1/9] dt-bindings: clock: clk-si5341: Add new attributes Robert Hancock
2021-03-11 22:24 ` Robert Hancock [this message]
2021-03-12 6:39 ` [PATCH 2/9] clk: si5341: Wait for DEVICE_READY on startup Mike Looijmans
2021-03-12 15:23 ` Robert Hancock
2021-03-11 22:24 ` [PATCH 3/9] clk: si5341: Avoid divide errors due to bogus register contents Robert Hancock
2021-03-11 22:24 ` [PATCH 4/9] clk: si5341: Check for input clock presence and PLL lock on startup Robert Hancock
2021-03-12 6:47 ` Mike Looijmans
2021-03-12 15:23 ` Robert Hancock
2021-03-11 22:24 ` [PATCH 5/9] clk: si5341: Update initialization magic Robert Hancock
2021-03-11 22:24 ` [PATCH 6/9] clk: si5341: Allow different output VDD_SEL values Robert Hancock
2021-03-12 0:09 ` kernel test robot
2021-03-12 0:09 ` [RFC PATCH] clk: si5341: si5341_remove() can be static kernel test robot
2021-03-12 0:48 ` [PATCH 6/9] clk: si5341: Allow different output VDD_SEL values kernel test robot
2021-03-11 22:24 ` [PATCH 7/9] clk: si5341: Add silabs,xaxb-ext-clk property Robert Hancock
2021-03-11 22:24 ` [PATCH 8/9] clk: si5341: Add silabs,iovdd-33 property Robert Hancock
2021-03-12 6:44 ` Mike Looijmans
2021-03-12 15:39 ` Robert Hancock
2021-03-11 22:24 ` [PATCH 9/9] clk: si5341: Add sysfs properties to allow checking/resetting device faults Robert Hancock
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=20210311222436.3826800-3-robert.hancock@calian.com \
--to=robert.hancock@calian.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=mike.looijmans@topic.nl \
--cc=mturquette@baylibre.com \
--cc=sboyd@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: 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