MLK-12767 imx6ull: fix runtime checking for i.MX6ULL

Fix runtime checking for i.MX6ULL. Add is_cpu_type(MXC_CPU_MX6ULL)
to avoid using wrong code path.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit 05922b0abf848949df778c19312cb1cf7fdfbe6a)

diff --git a/arch/arm/include/asm/arch-mx6/crm_regs.h b/arch/arm/include/asm/arch-mx6/crm_regs.h
index 74ed912..aebb6c5 100644 (file)
--- a/arch/arm/include/asm/arch-mx6/crm_regs.h
+++ b/arch/arm/include/asm/arch-mx6/crm_regs.h
@@ -432,15 +432,15 @@ struct mxc_ccm_reg {
 #define MXC_CCM_CS2CDR_ENFC_CLK_SEL_DQ(v)              (((v) & 0x3) << 16)
 
 #define MXC_CCM_CS2CDR_ENFC_CLK_SEL_MASK               \
-       ((is_mx6dqp() || is_cpu_type(MXC_CPU_MX6UL)) ?  \
+       ((is_mx6dqp() || is_mx6ul() || is_mx6ull()) ? \
         MXC_CCM_CS2CDR_ENFC_CLK_SEL_MASK_DQP :         \
         MXC_CCM_CS2CDR_ENFC_CLK_SEL_MASK_DQ)
 #define MXC_CCM_CS2CDR_ENFC_CLK_SEL_OFFSET             \
-       ((is_mx6dqp() || is_cpu_type(MXC_CPU_MX6UL)) ?  \
+       ((is_mx6dqp() || is_mx6ul() || is_mx6ull()) ? \
         MXC_CCM_CS2CDR_ENFC_CLK_SEL_OFFSET_DQP :       \
         MXC_CCM_CS2CDR_ENFC_CLK_SEL_OFFSET_DQ)
 #define MXC_CCM_CS2CDR_ENFC_CLK_SEL(v)                 \
-       ((is_mx6dqp() || is_cpu_type(MXC_CPU_MX6UL)) ?  \
+       ((is_mx6dqp() || is_mx6ul() || is_mx6ull()) ? \
         MXC_CCM_CS2CDR_ENFC_CLK_SEL_DQP(v) :           \
         MXC_CCM_CS2CDR_ENFC_CLK_SEL_DQ(v))