diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2017-08-21 20:49:44 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-12-21 14:28:03 +0100 |
| commit | f954e5a644e298bff87136320514603b76a157be (patch) | |
| tree | 43f7be0bf358bfd9eb1a06afd54c6cdf4b289306 | |
| parent | 415b94e56b77ca9f01b8e5e624b698c083134acf (diff) | |
imx: Fix 'Expose SoC unique ID' for newer i.MX6
i.MX6 SL/UL/ULL use a different node in the device tree for with ocotp.
So change to the relevant compatible string for these SoCs.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Stefan Agner <stefan.agner@toradex.com>
(cherry picked from commit 7b02a99744e495f630bdb5081c516d40e8112685)
| -rw-r--r-- | arch/arm/mach-imx/cpu.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index 3cfcbe43d6dd..d23af05447d0 100644 --- a/arch/arm/mach-imx/cpu.c +++ b/arch/arm/mach-imx/cpu.c @@ -77,24 +77,39 @@ static unsigned long long __init imx_get_soc_uid(void) void __iomem *ocotp_base; u64 uid = 0ull; - if (__mxc_cpu_type == MXC_CPU_IMX6SL || __mxc_cpu_type == MXC_CPU_IMX6DL || - __mxc_cpu_type == MXC_CPU_IMX6SX || __mxc_cpu_type == MXC_CPU_IMX6Q || - __mxc_cpu_type == MXC_CPU_IMX6UL || __mxc_cpu_type == MXC_CPU_IMX6ULL) { + if (__mxc_cpu_type == MXC_CPU_IMX6DL || __mxc_cpu_type == MXC_CPU_IMX6SX || + __mxc_cpu_type == MXC_CPU_IMX6Q) { np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-ocotp"); + } else if (__mxc_cpu_type == MXC_CPU_IMX6SL) { + np = of_find_compatible_node(NULL, NULL, "fsl,imx6sl-ocotp"); + } else if (__mxc_cpu_type == MXC_CPU_IMX6UL) { + np = of_find_compatible_node(NULL, NULL, "fsl,imx6ul-ocotp"); + } else if (__mxc_cpu_type == MXC_CPU_IMX6ULL) { + np = of_find_compatible_node(NULL, NULL, "fsl,imx6ull-ocotp");; } else if (__mxc_cpu_type == MXC_CPU_IMX7D) { np = of_find_compatible_node(NULL, NULL, "fsl,imx7d-ocotp"); } else { return uid; } + if (!np) { + pr_warn("failed to find ocotp node\n"); + return uid; + } + ocotp_base = of_iomap(np, 0); - WARN_ON(!ocotp_base); + if (!ocotp_base) { + pr_warn("failed to map ocotp\n"); + goto put_node; + } uid = readl_relaxed(ocotp_base + 0x420); uid = (uid << 0x20); uid |= readl_relaxed(ocotp_base + 0x410); iounmap(ocotp_base); + +put_node: of_node_put(np); return uid; |