67 lines
2.4 KiB
Diff
67 lines
2.4 KiB
Diff
|
From 0a93b83e09afdfdc4bef6ed2fe961fa169d5a362 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
|
||
|
|
Date: Thu, 4 May 2023 23:06:44 +0300
|
||
|
|
Subject: [PATCH 448/469] nvmem: rockchip-otp: Generalize
|
||
|
|
rockchip_otp_wait_status()
|
||
|
|
|
||
|
|
In preparation to support additional Rockchip OTP memory devices with
|
||
|
|
different register layout, generalize rockchip_otp_wait_status() to
|
||
|
|
accept a new parameter for specifying the offset of the status register.
|
||
|
|
|
||
|
|
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
|
||
|
|
Tested-by: Vincent Legoll <vincent.legoll@gmail.com>
|
||
|
|
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
|
||
|
|
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
||
|
|
---
|
||
|
|
drivers/nvmem/rockchip-otp.c | 11 ++++++-----
|
||
|
|
1 file changed, 6 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/nvmem/rockchip-otp.c b/drivers/nvmem/rockchip-otp.c
|
||
|
|
index b5a84b379da4..b62e001f9116 100644
|
||
|
|
--- a/drivers/nvmem/rockchip-otp.c
|
||
|
|
+++ b/drivers/nvmem/rockchip-otp.c
|
||
|
|
@@ -90,18 +90,19 @@ static int rockchip_otp_reset(struct rockchip_otp *otp)
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
-static int rockchip_otp_wait_status(struct rockchip_otp *otp, u32 flag)
|
||
|
|
+static int rockchip_otp_wait_status(struct rockchip_otp *otp,
|
||
|
|
+ unsigned int reg, u32 flag)
|
||
|
|
{
|
||
|
|
u32 status = 0;
|
||
|
|
int ret;
|
||
|
|
|
||
|
|
- ret = readl_poll_timeout_atomic(otp->base + OTPC_INT_STATUS, status,
|
||
|
|
+ ret = readl_poll_timeout_atomic(otp->base + reg, status,
|
||
|
|
(status & flag), 1, OTPC_TIMEOUT);
|
||
|
|
if (ret)
|
||
|
|
return ret;
|
||
|
|
|
||
|
|
/* clean int status */
|
||
|
|
- writel(flag, otp->base + OTPC_INT_STATUS);
|
||
|
|
+ writel(flag, otp->base + reg);
|
||
|
|
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
@@ -123,7 +124,7 @@ static int rockchip_otp_ecc_enable(struct rockchip_otp *otp, bool enable)
|
||
|
|
|
||
|
|
writel(SBPI_ENABLE_MASK | SBPI_ENABLE, otp->base + OTPC_SBPI_CTRL);
|
||
|
|
|
||
|
|
- ret = rockchip_otp_wait_status(otp, OTPC_SBPI_DONE);
|
||
|
|
+ ret = rockchip_otp_wait_status(otp, OTPC_INT_STATUS, OTPC_SBPI_DONE);
|
||
|
|
if (ret < 0)
|
||
|
|
dev_err(otp->dev, "timeout during ecc_enable\n");
|
||
|
|
|
||
|
|
@@ -156,7 +157,7 @@ static int px30_otp_read(void *context, unsigned int offset,
|
||
|
|
otp->base + OTPC_USER_ADDR);
|
||
|
|
writel(OTPC_USER_FSM_ENABLE | OTPC_USER_FSM_ENABLE_MASK,
|
||
|
|
otp->base + OTPC_USER_ENABLE);
|
||
|
|
- ret = rockchip_otp_wait_status(otp, OTPC_USER_DONE);
|
||
|
|
+ ret = rockchip_otp_wait_status(otp, OTPC_INT_STATUS, OTPC_USER_DONE);
|
||
|
|
if (ret < 0) {
|
||
|
|
dev_err(otp->dev, "timeout during read setup\n");
|
||
|
|
goto read_end;
|
||
|
|
--
|
||
|
|
2.34.1
|
||
|
|
|