From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 19 Dec 2025 14:40:54 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vWaj0-00DDPr-28 for lore@lore.pengutronix.de; Fri, 19 Dec 2025 14:40:54 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1vWaj0-0001vd-20 for lore@pengutronix.de; Fri, 19 Dec 2025 14:40:54 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=VCKRrdcryAWA272ej1uGj+Ze/2MEhKEKI2fRAeeK6Q0=; b=u+WF01DGkalRJrq5Tbk2DPhCwk b9+LeL6C0tY+VdDc7N4azGnGjNAnHoLI6ykHuUJt607jUNiZJt6ZxjbISu3GWLBbgZQCFrtr/9jRG wrhExqq1YAvgQNi7hMwYDo+brLLSv03teLuoLrbCayhsELMPzf9ekYV3xuFC6nRvi+6C2Wa6Wgk1H rUK0Lqp0fX7OsJ7bj8cqLNQTgBQCbRrvbZnFD3EAz0feGSwE5FJZToLJdhnz6ndzmfyOAQBKVLf7U pbn1goK+uyLUQyAzjEdtIQZ2jeav+Agle5lb9EcbTlouwp9Y3wp4XIvEdgtSUeccyH66XysjXe+fD hw4gMJ9w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vWaiG-0000000AMZg-2SmM; Fri, 19 Dec 2025 13:40:08 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vWaiD-0000000AMXl-2n7G for barebox@lists.infradead.org; Fri, 19 Dec 2025 13:40:06 +0000 Received: from dude06.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::5c]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vWai4-0001XS-2f; Fri, 19 Dec 2025 14:39:56 +0100 From: Fabian Pflug Date: Fri, 19 Dec 2025 14:39:55 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251219-v2025-11-0-topic-imx6-field-return-v4-3-57eec237ceaf@pengutronix.de> References: <20251219-v2025-11-0-topic-imx6-field-return-v4-0-57eec237ceaf@pengutronix.de> In-Reply-To: <20251219-v2025-11-0-topic-imx6-field-return-v4-0-57eec237ceaf@pengutronix.de> To: Marco Felsch , BAREBOX , Lucas Stach , Ahmad Fatoum Cc: Fabian Pflug X-Mailer: b4 0.14.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20251219_054005_714351_929C3489 X-CRM114-Status: UNSURE ( 9.51 ) X-CRM114-Notice: Please train this message. X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-3.0 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v4 3/5] nvmem: ocotp: extend support to query the sticky bit X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) The i.MX* devices do have an sticky bit which indicates if the field-return fuse can be written. Before only support for i.MX8* was provided. Extend this for the i.MX6* series. Since i.MX8 and i.MX6 share the same code, rename imx8m_field_return_locked to imx_field_return_locked to not confuse the user. Reviewed-by: Marco Felsch Signed-off-by: Fabian Pflug --- drivers/nvmem/ocotp.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/nvmem/ocotp.c b/drivers/nvmem/ocotp.c index 7bca275404..1f74fddb60 100644 --- a/drivers/nvmem/ocotp.c +++ b/drivers/nvmem/ocotp.c @@ -294,7 +294,7 @@ static void imx8m_lock_srk_revoke(struct ocotp_priv *priv) writel(val, priv->base + OCOTP_SW_STICKY); } -static bool imx8m_field_return_locked(struct ocotp_priv *priv) +static bool imx_field_return_locked(struct ocotp_priv *priv) { return readl(priv->base + OCOTP_SW_STICKY) & OCOTP_SW_STICKY_FIELD_RETURN_LOCK; } @@ -990,6 +990,7 @@ static struct imx_ocotp_data imx6q_ocotp_data = { .fuse_blow = imx6_fuse_blow_addr, .fuse_read = imx6_fuse_read_addr, .ctrl = &ocotp_ctrl_reg_default, + .field_return_locked = imx_field_return_locked, }; static struct imx_ocotp_data imx6sl_ocotp_data = { @@ -1002,6 +1003,7 @@ static struct imx_ocotp_data imx6sl_ocotp_data = { .fuse_blow = imx6_fuse_blow_addr, .fuse_read = imx6_fuse_read_addr, .ctrl = &ocotp_ctrl_reg_default, + .field_return_locked = imx_field_return_locked, }; static struct imx_ocotp_data imx6ul_ocotp_data = { @@ -1014,6 +1016,7 @@ static struct imx_ocotp_data imx6ul_ocotp_data = { .fuse_blow = imx6_fuse_blow_addr, .fuse_read = imx6_fuse_read_addr, .ctrl = &ocotp_ctrl_reg_default, + .field_return_locked = imx_field_return_locked, }; static struct imx_ocotp_data imx6ull_ocotp_data = { @@ -1026,6 +1029,7 @@ static struct imx_ocotp_data imx6ull_ocotp_data = { .fuse_blow = imx6_fuse_blow_addr, .fuse_read = imx6_fuse_read_addr, .ctrl = &ocotp_ctrl_reg_default, + .field_return_locked = imx_field_return_locked, }; static struct imx_ocotp_data vf610_ocotp_data = { @@ -1063,7 +1067,7 @@ static struct imx_ocotp_data imx8mp_ocotp_data = { .fuse_read = imx6_fuse_read_addr, .srk_revoke_locked = imx8m_srk_revoke_locked, .lock_srk_revoke = imx8m_lock_srk_revoke, - .field_return_locked = imx8m_field_return_locked, + .field_return_locked = imx_field_return_locked, .ctrl = &ocotp_ctrl_reg_8mp, }; @@ -1095,7 +1099,7 @@ static struct imx_ocotp_data imx8mm_ocotp_data = { .fuse_read = imx6_fuse_read_addr, .srk_revoke_locked = imx8m_srk_revoke_locked, .lock_srk_revoke = imx8m_lock_srk_revoke, - .field_return_locked = imx8m_field_return_locked, + .field_return_locked = imx_field_return_locked, .feat = &imx8mm_featctrl_data, .ctrl = &ocotp_ctrl_reg_default, }; @@ -1116,7 +1120,7 @@ static struct imx_ocotp_data imx8mn_ocotp_data = { .fuse_read = imx6_fuse_read_addr, .srk_revoke_locked = imx8m_srk_revoke_locked, .lock_srk_revoke = imx8m_lock_srk_revoke, - .field_return_locked = imx8m_field_return_locked, + .field_return_locked = imx_field_return_locked, .feat = &imx8mn_featctrl_data, .ctrl = &ocotp_ctrl_reg_default, }; -- 2.47.3