From ca98a9fca54b491755e515ca0f0d7f53a19ad74f Mon Sep 17 00:00:00 2001 From: Anson Huang Date: Thu, 13 Sep 2018 13:56:41 +0800 Subject: imx8mq: fix soc_id issue The chip revision should ONLY overwrite the lower 16 bits of soc_id, otherwise, the cpu_is_imx8mq() API in Linux kernel will be incorrect. Signed-off-by: Anson Huang --- plat/imx/imx8mq/src.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plat/imx/imx8mq/src.c b/plat/imx/imx8mq/src.c index f77d2551..4c7b0909 100644 --- a/plat/imx/imx8mq/src.c +++ b/plat/imx/imx8mq/src.c @@ -66,7 +66,8 @@ int imx_soc_handler(uint32_t smc_fid, u_register_t x1, u_register_t x2, } else if (mmio_read_32(IMX_OCOTP_BASE + SW_INFO_B1) == 0xff0055aa) { /* 0xff0055aa is magic number for B1 */ - val = 0x21; + val &= ~0xff; + val |= 0x21; } } -- cgit v1.2.3