]> 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)
commitbf8daaeb1dac4b17e397c0dac29791b6b5eb7f09
treecb0934f2b51a20c47896da654aafe4ffb6e27510
parentf17f3e34f29f6656e6d9cc2c26bd03739d98e651
ARM: imx: Correct ocotp id for serial number support of i.MX6ULL/ULZ SoCs

After the commit b9eeb258a3ce ("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
3e3f25555e42 ("nvmem: imx-ocotp: Implement i.MX6ULL/ULZ support") and commit
40407fa51522 ("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: b9eeb258a3ce ("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