Skip to contentSkip to conversation

soc: imx8m: Correct i.MX8MP UID fuse offset

PATCH Applied Anson Huang 3 participants 3 messages Jun 10, 2020 – Jun 23, 2020 Arm i.MX and Layerscape

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 soc: imx8m: Correct i.MX8MP UID fuse offset

Correct i.MX8MP UID fuse offset according to fuse map:

UID_LOW: 0x420
UID_HIGH: 0x430

Fixes fc40200ebf82 ("soc: imx: increase build coverage for imx8m soc driver")
Fixes 18f662a73862 ("soc: imx: Add i.MX8MP SoC driver support")

---
Changes since V2:
- add one more fix tag for original patch before file name is changed.

---
 drivers/soc/imx/soc-imx8m.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/soc/imx/soc-imx8m.c +6 -2
index 7b0759a..0bc8314 100644
@@ -22,6 +22,8 @@
 #define OCOTP_UID_LOW			0x410
 #define OCOTP_UID_HIGH			0x420
 
+#define IMX8MP_OCOTP_UID_OFFSET		0x10
+
 /* Same as ANADIG_DIGPROG_IMX7D */
 #define ANADIG_DIGPROG_IMX8MM	0x800
 
@@ -87,6 +89,8 @@ static void __init imx8mm_soc_uid(void)
 {
 	void __iomem *ocotp_base;
 	struct device_node *np;
+	u32 offset = of_machine_is_compatible("fsl,imx8mp") ?
+		     IMX8MP_OCOTP_UID_OFFSET : 0;
 
 	np = of_find_compatible_node(NULL, NULL, "fsl,imx8mm-ocotp");
 	if (!np)
@@ -95,9 +99,9 @@ static void __init imx8mm_soc_uid(void)
 	ocotp_base = of_iomap(np, 0);
 	WARN_ON(!ocotp_base);
 
-	soc_uid = readl_relaxed(ocotp_base + OCOTP_UID_HIGH);
+	soc_uid = readl_relaxed(ocotp_base + OCOTP_UID_HIGH + offset);
 	soc_uid <<= 32;
-	soc_uid |= readl_relaxed(ocotp_base + OCOTP_UID_LOW);
+	soc_uid |= readl_relaxed(ocotp_base + OCOTP_UID_LOW + offset);
 
 	iounmap(ocotp_base);
 	of_node_put(np);
Signature · 1 line
2.7.4
Reviewed-by on v3 1/1
#1 lore raw
Quoted 8 lines · Anson Huang

Correct i.MX8MP UID fuse offset according to fuse map:

UID_LOW: 0x420
UID_HIGH: 0x430

Fixes fc40200ebf82 ("soc: imx: increase build coverage for imx8m soc driver")
Fixes 18f662a73862 ("soc: imx: Add i.MX8MP SoC driver support")
Quoted 42 lines

---
Changes since V2:
- add one more fix tag for original patch before file name is changed.

---
  drivers/soc/imx/soc-imx8m.c | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
drivers/soc/imx/soc-imx8m.c +6 -2
index 7b0759a..0bc8314 100644
@@ -22,6 +22,8 @@
  #define OCOTP_UID_LOW			0x410
  #define OCOTP_UID_HIGH			0x420
 
+#define IMX8MP_OCOTP_UID_OFFSET		0x10
+
  /* Same as ANADIG_DIGPROG_IMX7D */
  #define ANADIG_DIGPROG_IMX8MM	0x800
 
@@ -87,6 +89,8 @@ static void __init imx8mm_soc_uid(void)
  {
  	void __iomem *ocotp_base;
  	struct device_node *np;
+	u32 offset = of_machine_is_compatible("fsl,imx8mp") ?
+		     IMX8MP_OCOTP_UID_OFFSET : 0;
 
  	np = of_find_compatible_node(NULL, NULL, "fsl,imx8mm-ocotp");
  	if (!np)
@@ -95,9 +99,9 @@ static void __init imx8mm_soc_uid(void)
  	ocotp_base = of_iomap(np, 0);
  	WARN_ON(!ocotp_base);
 
-	soc_uid = readl_relaxed(ocotp_base + OCOTP_UID_HIGH);
+	soc_uid = readl_relaxed(ocotp_base + OCOTP_UID_HIGH + offset);
  	soc_uid <<= 32;
-	soc_uid |= readl_relaxed(ocotp_base + OCOTP_UID_LOW);
+	soc_uid |= readl_relaxed(ocotp_base + OCOTP_UID_LOW + offset);
 
  	iounmap(ocotp_base);
  	of_node_put(np);
Applied
#2 lore raw
In reply to Anson Huang
Quoted 8 lines · Anson Huang

Correct i.MX8MP UID fuse offset according to fuse map:

UID_LOW: 0x420
UID_HIGH: 0x430

Fixes fc40200ebf82 ("soc: imx: increase build coverage for imx8m soc driver")
Fixes 18f662a73862 ("soc: imx: Add i.MX8MP SoC driver support")

Applied, thanks.