From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>,
Rouven Czerwinski <rcz@pengutronix.de>,
Christian Eggers <ceggers@arri.de>
Subject: [PATCH master 6/7] nvmem: ocotp: align OCOTP bank count with Linux
Date: Tue, 2 Jan 2024 18:00:59 +0100 [thread overview]
Message-ID: <20240102170100.1596372-7-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20240102170100.1596372-1-a.fatoum@pengutronix.de>
Now that struct imx_ocotp_data::nregs is equivalent to the Linux driver's
struct ocotp_params::nregs, the differences between the Linux driver and
barebox are easy to spot. Some of the differences were only quite recently
added to Linux in v6.7-rc1 (i.MX6UL, i.MX6ULL), but others have been
that way since they were first added to the Linux driver.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
Cc: Rouven Czerwinski <rcz@pengutronix.de>
Cc: Christian Eggers <ceggers@arri.de>
---
drivers/nvmem/ocotp.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/nvmem/ocotp.c b/drivers/nvmem/ocotp.c
index 76c50a964435..6480fd95238e 100644
--- a/drivers/nvmem/ocotp.c
+++ b/drivers/nvmem/ocotp.c
@@ -875,7 +875,7 @@ static struct imx_ocotp_data imx6sl_ocotp_data = {
};
static struct imx_ocotp_data imx6ul_ocotp_data = {
- .nregs = 128,
+ .nregs = 144,
.addr_to_offset = imx6q_addr_to_offset,
.mac_offsets_num = 2,
.mac_offsets = { MAC_OFFSET_0, IMX6UL_MAC_OFFSET_1 },
@@ -886,7 +886,7 @@ static struct imx_ocotp_data imx6ul_ocotp_data = {
};
static struct imx_ocotp_data imx6ull_ocotp_data = {
- .nregs = 64,
+ .nregs = 80,
.addr_to_offset = imx6q_addr_to_offset,
.mac_offsets_num = 2,
.mac_offsets = { MAC_OFFSET_0, IMX6UL_MAC_OFFSET_1 },
@@ -914,7 +914,7 @@ static struct imx8m_featctrl_data imx8mp_featctrl_data = {
};
static struct imx_ocotp_data imx8mp_ocotp_data = {
- .nregs = 256,
+ .nregs = 384,
.addr_to_offset = imx6sl_addr_to_offset,
.mac_offsets_num = 2,
.mac_offsets = { 0x90, 0x94 },
@@ -923,7 +923,7 @@ static struct imx_ocotp_data imx8mp_ocotp_data = {
};
static struct imx_ocotp_data imx8mq_ocotp_data = {
- .nregs = 512,
+ .nregs = 256,
.addr_to_offset = imx6sl_addr_to_offset,
.mac_offsets_num = 1,
.mac_offsets = { 0x90 },
@@ -939,7 +939,7 @@ static struct imx8m_featctrl_data imx8mm_featctrl_data = {
};
static struct imx_ocotp_data imx8mm_ocotp_data = {
- .nregs = 512,
+ .nregs = 256,
.addr_to_offset = imx6sl_addr_to_offset,
.mac_offsets_num = 1,
.mac_offsets = { 0x90 },
@@ -956,7 +956,7 @@ static struct imx8m_featctrl_data imx8mn_featctrl_data = {
};
static struct imx_ocotp_data imx8mn_ocotp_data = {
- .nregs = 512,
+ .nregs = 256,
.addr_to_offset = imx6sl_addr_to_offset,
.mac_offsets_num = 1,
.mac_offsets = { 0x90 },
@@ -968,7 +968,7 @@ static struct imx_ocotp_data imx8mn_ocotp_data = {
};
static struct imx_ocotp_data imx7d_ocotp_data = {
- .nregs = 512,
+ .nregs = 64,
.addr_to_offset = imx6sl_addr_to_offset,
.mac_offsets_num = 1,
.mac_offsets = { MAC_OFFSET_0, IMX6UL_MAC_OFFSET_1 },
--
2.39.2
next prev parent reply other threads:[~2024-01-02 17:02 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-02 17:00 [PATCH master 0/7] regmap: fix size of regmap-backed cdev and nvmem Ahmad Fatoum
2024-01-02 17:00 ` [PATCH master 1/7] regmap: fix calculation of regmap size when reg_stride != 1 Ahmad Fatoum
2024-01-02 17:00 ` [PATCH master 2/7] nvmem: bsec: correct regmap's max_register Ahmad Fatoum
2024-01-08 10:29 ` Robin van der Gracht
2024-01-08 10:44 ` Ahmad Fatoum
2024-01-08 11:17 ` Robin van der Gracht
2024-01-08 12:48 ` Robin van der Gracht
2024-01-11 7:35 ` Ahmad Fatoum
2024-01-02 17:00 ` [PATCH master 3/7] nvmem: startfive-otp: " Ahmad Fatoum
2024-01-02 17:00 ` [PATCH master 4/7] nvmem: imx-ocotp-ele: " Ahmad Fatoum
2024-01-02 17:00 ` [PATCH master 5/7] nvmem: ocotp: " Ahmad Fatoum
2024-01-02 17:00 ` Ahmad Fatoum [this message]
2024-01-02 17:01 ` [PATCH master 7/7] nvmem: regmap: Fix nvmem size Ahmad Fatoum
2024-01-08 9:43 ` [PATCH master 0/7] regmap: fix size of regmap-backed cdev and nvmem Sascha Hauer
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=20240102170100.1596372-7-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=ceggers@arri.de \
--cc=rcz@pengutronix.de \
/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