* [PATCH 1/3] nvmem: ocotp: Elongate OCOTP_CTRL_ADDR field
@ 2019-06-11 6:49 Rouven Czerwinski
2019-06-11 8:30 ` Sascha Hauer
0 siblings, 1 reply; 2+ messages in thread
From: Rouven Czerwinski @ 2019-06-11 6:49 UTC (permalink / raw)
To: barebox; +Cc: Rouven Czerwinski
Port of patch from linux-arm-kernel:
| From: Bryan O'Donoghue <pure.logic@nexus-software.ie>
|
| nvmem: imx-ocotp: Elongate OCOTP_CTRL ADDR field to eight bits
|
| i.MX6 defines OCOTP_CTRLn:ADDR as seven bit address-field with a one bit
| RSVD0 field, i.MX7 defines OCOTP_CTRLn:ADDR as a four bit address-field
| with a four bit RSVD0 field.
|
| i.MX8 defines the OCOTP_CTRLn:ADDR bit-field as a full range eight bits.
|
| i.MX6 and i.MX7 should return zero for their respective RSVD0 bits and
| ignore a write-back of zero where i.MX8 will make use of the full range.
|
| This patch expands the bit-field definition for all users to eight bits,
| which is safe due to RSVD0 being a no-op for the i.MX6 and i.MX7.
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
drivers/nvmem/ocotp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/nvmem/ocotp.c b/drivers/nvmem/ocotp.c
index 5b8b925cb4..ab543b475f 100644
--- a/drivers/nvmem/ocotp.c
+++ b/drivers/nvmem/ocotp.c
@@ -51,7 +51,7 @@
#define OCOTP_CTRL_WR_UNLOCK_KEY 0x3E77
#define OCOTP_CTRL_WR_UNLOCK_MASK 0xFFFF0000
#define OCOTP_CTRL_ADDR 0
-#define OCOTP_CTRL_ADDR_MASK 0x0000007F
+#define OCOTP_CTRL_ADDR_MASK 0x000000FF
#define OCOTP_CTRL_BUSY (1 << 8)
#define OCOTP_CTRL_ERROR (1 << 9)
#define OCOTP_CTRL_RELOAD_SHADOWS (1 << 10)
--
2.22.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 1/3] nvmem: ocotp: Elongate OCOTP_CTRL_ADDR field
2019-06-11 6:49 [PATCH 1/3] nvmem: ocotp: Elongate OCOTP_CTRL_ADDR field Rouven Czerwinski
@ 2019-06-11 8:30 ` Sascha Hauer
0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2019-06-11 8:30 UTC (permalink / raw)
To: Rouven Czerwinski; +Cc: barebox
On Tue, Jun 11, 2019 at 08:49:05AM +0200, Rouven Czerwinski wrote:
> Port of patch from linux-arm-kernel:
> | From: Bryan O'Donoghue <pure.logic@nexus-software.ie>
> |
> | nvmem: imx-ocotp: Elongate OCOTP_CTRL ADDR field to eight bits
> |
> | i.MX6 defines OCOTP_CTRLn:ADDR as seven bit address-field with a one bit
> | RSVD0 field, i.MX7 defines OCOTP_CTRLn:ADDR as a four bit address-field
> | with a four bit RSVD0 field.
> |
> | i.MX8 defines the OCOTP_CTRLn:ADDR bit-field as a full range eight bits.
> |
> | i.MX6 and i.MX7 should return zero for their respective RSVD0 bits and
> | ignore a write-back of zero where i.MX8 will make use of the full range.
> |
> | This patch expands the bit-field definition for all users to eight bits,
> | which is safe due to RSVD0 being a no-op for the i.MX6 and i.MX7.
>
> Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> ---
> drivers/nvmem/ocotp.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Applied, thanks
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-06-11 8:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-11 6:49 [PATCH 1/3] nvmem: ocotp: Elongate OCOTP_CTRL_ADDR field Rouven Czerwinski
2019-06-11 8:30 ` Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox