]> git.baikalelectronics.ru Git - kernel.git/commit
ARM: imx: Correct ocotp id for serial number support of i.MX6ULL/ULZ SoCs
authorChristoph Niedermaier <cniedermaier@dh-electronics.com>
Thu, 5 Dec 2019 09:38:51 +0000 (09:38 +0000)
committerShawn Guo <shawnguo@kernel.org>
Wed, 11 Dec 2019 06:59:24 +0000 (14:59 +0800)
commit49683fa44797a206a7f6343e2495efde15e78c06
treecb0934f2b51a20c47896da654aafe4ffb6e27510
parent3d1eb0068fe80f6b7f368250469ede4e6b4b20c5
ARM: imx: Correct ocotp id for serial number support of i.MX6ULL/ULZ SoCs

After the commit 9568e7ed2c92 ("ARM: imx: Add serial number support for i.MX6/7 SoCs")
the kernel doesn't start on i.MX6ULL/ULZ SoC.
Tested on next-20191205.

For i.MX6ULL/ULZ the variable "ocotp_compat" is set to "fsl,imx6ul-ocotp", but with commit
22ec05ed8570 ("nvmem: imx-ocotp: Implement i.MX6ULL/ULZ support") and commit
84b794705903 ("ARM: dts: imx6ull: Fix i.MX6ULL/ULZ ocotp compatible") the value
"fsl,imx6ull-ocotp" is already defined and set in device tree...

By setting "ocotp_compat" to "fsl,imx6ull-ocotp" the kernel does boot.

Fixes: 9568e7ed2c92 ("ARM: imx: Add serial number support for i.MX6/7 SoCs")
Signed-off-by: Christoph Niedermaier <cniedermaier@dh-electronics.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm/mach-imx/cpu.c