commit f564016f9cecb33b0e51b9a4b5ecdb5ed739ea1c
author Anson Huang <Anson.Huang@nxp.com> Thu Sep 13 13:56:41 2018 +0800
committer Jacky Bai <ping.bai@nxp.com> Fri Jan 25 18:51:17 2019 +0800
tree 49a8bd20f6f79a95702f162f1b3852fa7a787435
parent 4970f87f8046c35894b6071b4492e692b5360e6d

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 <Anson.Huang@nxp.com>
(cherry picked from commit ca98a9fca54b491755e515ca0f0d7f53a19ad74f)

plat/imx/imx8mq/src.c

diff --git a/plat/imx/imx8mq/src.c b/plat/imx/imx8mq/src.c
index c9af655..696f68b 100644
--- a/plat/imx/imx8mq/src.c
+++ b/plat/imx/imx8mq/src.c
@@ -65,7 +65,8 @@
 		} else if (mmio_read_32(IMX_OCOTP_BASE + SW_INFO_B1)
 			   == 0xff0055aa) {
 			/* 0xff0055aa is magic number for B1 */
-			val = 0x21;
+			val &= ~0xff;
+			val |= 0x21;
 		}
 	}