diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-09-18 15:17:33 +0200 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-09-18 15:17:33 +0200 |
commit | 843b84fd822ffdd9b4b058b0f2bcd8faf5a850b9 (patch) | |
tree | dd02d08a2833641aae6120c2883fa1a727e4fa69 /arch/arm/mach-imx/mxc.h | |
parent | bea227e90a607d5df50f1c0aa929b855a54ed664 (diff) | |
parent | dc4ba17dfdb745646ef7688aa1ef4782a475299d (diff) |
Merge remote-tracking branch 'remotes/codeaurora/imx_4.14.98_2.3.0' into toradex_4.14-2.3.x-imx
Diffstat (limited to 'arch/arm/mach-imx/mxc.h')
-rw-r--r-- | arch/arm/mach-imx/mxc.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/mxc.h b/arch/arm/mach-imx/mxc.h index 95e7c3e6f141..43ee3c209513 100644 --- a/arch/arm/mach-imx/mxc.h +++ b/arch/arm/mach-imx/mxc.h @@ -42,6 +42,7 @@ #define MXC_CPU_IMX6ULL 0x65 #define MXC_CPU_IMX6SLL 0x67 #define MXC_CPU_IMX6ULZ 0x6B +#define MXC_CPU_IMX6ULZL 0x6C /* Dummy ID */ #define MXC_CPU_IMX7D 0x72 #define MXC_CPU_IMX7ULP 0xff /* TBD */ @@ -86,7 +87,8 @@ static inline bool cpu_is_imx6ul(void) static inline bool cpu_is_imx6ull(void) { return __mxc_cpu_type == MXC_CPU_IMX6ULL || - __mxc_cpu_type == MXC_CPU_IMX6ULZ; + __mxc_cpu_type == MXC_CPU_IMX6ULZ || + __mxc_cpu_type == MXC_CPU_IMX6ULZL; } static inline bool cpu_is_imx6sll(void) @@ -108,7 +110,8 @@ static inline bool cpu_is_imx6(void) __mxc_cpu_type == MXC_CPU_IMX6UL || __mxc_cpu_type == MXC_CPU_IMX6ULL || __mxc_cpu_type == MXC_CPU_IMX6SLL || - __mxc_cpu_type == MXC_CPU_IMX6ULZ; + __mxc_cpu_type == MXC_CPU_IMX6ULZ || + __mxc_cpu_type == MXC_CPU_IMX6ULZL; } static inline bool cpu_is_imx7d(void) |