From: Alexander Dahl <ada@thorsis.com>
To: Claudiu Beznea <claudiu.beznea@tuxon.dev>
Cc: Nicolas Ferre <nicolas.ferre@microchip.com>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
Ryan Wanner <ryan.wanner@microchip.com>,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org,
stable@vger.kernel.org, Srinivas Kandagatla <srini@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: [PATCH v3 11/19] nvmem: microchip-otpc: Fix swapped 'sleep' and 'timeout' parameters
Date: Tue, 20 Jan 2026 16:44:45 +0100 [thread overview]
Message-ID: <20260120154502.1280938-5-ada@thorsis.com> (raw)
In-Reply-To: <20260120154502.1280938-1-ada@thorsis.com>
Makes no sense to have a timeout shorter than the sleep time, it would
run into timeout right after the first sleep already.
While at it, use a more specific macro instead of the generic one, which
does exactly the same, but needs less parameters.
Fixes: 98830350d3fc ("nvmem: microchip-otpc: add support")
Cc: stable@vger.kernel.org
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
Notes:
v3:
- Reorder tags
- Add stable tag
v2:
- Add Fixes tag
drivers/nvmem/microchip-otpc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/nvmem/microchip-otpc.c b/drivers/nvmem/microchip-otpc.c
index e2851c63cc0b4..bf7e5167152cb 100644
--- a/drivers/nvmem/microchip-otpc.c
+++ b/drivers/nvmem/microchip-otpc.c
@@ -85,8 +85,8 @@ static int mchp_otpc_prepare_read(struct mchp_otpc *otpc,
writel_relaxed(MCHP_OTPC_CR_READ, otpc->base + MCHP_OTPC_CR);
/* Wait for packet to be transferred into temporary buffers. */
- return read_poll_timeout(readl_relaxed, tmp, !(tmp & MCHP_OTPC_SR_READ),
- 10000, 2000, false, otpc->base + MCHP_OTPC_SR);
+ return readl_relaxed_poll_timeout(otpc->base + MCHP_OTPC_SR, tmp,
+ !(tmp & MCHP_OTPC_SR_READ), 2000, 10000);
}
/*
--
2.47.3
next prev parent reply other threads:[~2026-01-20 15:45 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-20 14:37 [PATCH v3 00/19] Microchip OTPC driver on SAM9X60 exposing UIDxR as additional nvmem device Alexander Dahl
2026-01-20 14:37 ` [PATCH v3 01/19] MAINTAINERS: Add sam9/sama to (AT91) SoC support Alexander Dahl
2026-01-20 14:37 ` [PATCH v3 02/19] dt-bindings: clock: at91: Split up per SoC partially Alexander Dahl
2026-01-22 16:46 ` Rob Herring (Arm)
2026-01-31 15:43 ` Claudiu Beznea
2026-01-20 14:37 ` [PATCH v3 03/19] dt-bindings: clock: at91: Allow referencing main rc oscillator in DT Alexander Dahl
2026-01-31 15:44 ` Claudiu Beznea
2026-02-09 8:08 ` Alexander Dahl
2026-03-08 16:43 ` Claudiu Beznea
2026-01-20 14:37 ` [PATCH v3 04/19] clk: at91: Use new PMC bindings Alexander Dahl
2026-01-31 15:44 ` Claudiu Beznea
2026-01-20 14:37 ` [PATCH v3 05/19] clk: at91: sama7d65: Use highest PMC definition as max index Alexander Dahl
2026-01-31 15:45 ` Claudiu Beznea
2026-01-20 14:37 ` [PATCH v3 06/19] clk: at91: Allow enabling main_rc_osc through DT Alexander Dahl
2026-01-31 15:45 ` Claudiu Beznea
2026-01-20 14:37 ` [PATCH v3 07/19] clk: at91: Add peripheral id for OTPC Alexander Dahl
2026-01-31 15:45 ` Claudiu Beznea
2026-01-20 15:44 ` Alexander Dahl
2026-01-20 15:44 ` [PATCH v3 08/19] dt-bindings: nvmem: microchip-otpc: Add compatible for SAM9X60 Alexander Dahl
2026-01-20 15:44 ` [PATCH v3 09/19] dt-bindings: nvmem: microchip-otpc: Add required clocks Alexander Dahl
2026-01-20 16:30 ` Rob Herring (Arm)
2026-01-31 15:47 ` Claudiu Beznea
2026-01-31 15:51 ` Claudiu Beznea
2026-02-20 9:58 ` Alexander Dahl
2026-03-08 16:42 ` Claudiu Beznea
2026-03-08 16:45 ` Claudiu Beznea
2026-01-20 15:44 ` [PATCH v3 10/19] nvmem: microchip-otpc: Avoid reading a write-only register Alexander Dahl
2026-01-31 15:58 ` Claudiu Beznea
2026-01-20 15:44 ` Alexander Dahl [this message]
2026-01-31 16:00 ` [PATCH v3 11/19] nvmem: microchip-otpc: Fix swapped 'sleep' and 'timeout' parameters Claudiu Beznea
2026-01-20 15:44 ` [PATCH v3 12/19] nvmem: microchip-otpc: Add SAM9X60 support Alexander Dahl
2026-01-31 15:53 ` Claudiu Beznea
2026-01-20 15:44 ` [PATCH v3 13/19] nvmem: microchip-otpc: Enable necessary clocks Alexander Dahl
2026-01-31 16:03 ` Claudiu Beznea
2026-01-20 15:44 ` [PATCH v3 14/19] nvmem: microchip-otpc: Expose UID registers as 2nd nvmem device Alexander Dahl
2026-01-31 16:11 ` Claudiu Beznea
2026-02-20 10:38 ` Alexander Dahl
2026-03-08 16:40 ` Claudiu Beznea
2026-01-20 15:44 ` [PATCH v3 15/19] ARM: dts: microchip: Use new PMC bindings Alexander Dahl
2026-01-20 15:44 ` [PATCH v3 16/19] ARM: dts: microchip: sama7g5: Add OTPC clocks Alexander Dahl
2026-01-20 15:44 ` [PATCH v3 17/19] ARM: dts: microchip: sam9x60: Add OTPC node Alexander Dahl
2026-01-20 15:44 ` [PATCH v3 18/19] ARM: dts: microchip: sam9x60_curiosity: Enable OTP Controller Alexander Dahl
2026-01-20 15:44 ` [PATCH v3 19/19] dt-bindings: clock: at91: Remove old PMC definitions Alexander Dahl
2026-01-22 16:47 ` Rob Herring (Arm)
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=20260120154502.1280938-5-ada@thorsis.com \
--to=ada@thorsis.com \
--cc=alexandre.belloni@bootlin.com \
--cc=claudiu.beznea@tuxon.dev \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nicolas.ferre@microchip.com \
--cc=ryan.wanner@microchip.com \
--cc=srini@kernel.org \
--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: 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