Commit cff14475967f90ba49c81128f47923a3bd2a66bd

Authored by Wasim Khan
Committed by Priyanka Jain
1 parent 254a7e3ff9

armv8: lx2: SVR_SOC_VER: Mask CAN_FD and security bit

Multiple LX2(LX2160A/LX2162A SoC) personality variants
exists based on CAN-FD and security bit in SVR.

Currenly SVR_SOC_VER mask only security bit.
Update SVR_SOC_VER to mask CAN_FD and security bit
for LX2 products.

Signed-off-by: Wasim Khan <wasim.khan@nxp.com>

Showing 1 changed file with 5 additions and 2 deletions Side-by-side Diff

arch/arm/include/asm/arch-fsl-layerscape/soc.h
1 1 /* SPDX-License-Identifier: GPL-2.0+ */
2 2 /*
3   - * Copyright 2017-2020 NXP
  3 + * Copyright 2017-2021 NXP
4 4 * Copyright 2015 Freescale Semiconductor
5 5 */
6 6  
7 7  
... ... @@ -82,10 +82,13 @@
82 82 #define SVR_MAJ(svr) (((svr) >> 4) & 0xf)
83 83 #define SVR_MIN(svr) (((svr) >> 0) & 0xf)
84 84 #define SVR_REV(svr) (((svr) >> 0) & 0xff)
85   -#define SVR_SOC_VER(svr) (((svr) >> 8) & SVR_WO_E)
86 85 #define IS_E_PROCESSOR(svr) (!((svr >> 8) & 0x1))
87 86 #if defined(CONFIG_ARCH_LX2160A) || defined(CONFIG_ARCH_LX2162A)
88 87 #define IS_C_PROCESSOR(svr) (!((svr >> 12) & 0x1))
  88 +#define SVR_WO_CE 0xFFFFEE
  89 +#define SVR_SOC_VER(svr) (((svr) >> 8) & SVR_WO_CE)
  90 +#else
  91 +#define SVR_SOC_VER(svr) (((svr) >> 8) & SVR_WO_E)
89 92 #endif
90 93 #ifdef CONFIG_ARCH_LS1028A
91 94 #define IS_MULTIMEDIA_EN(svr) (!((svr >> 10) & 0x1))