diff options
| author | Stefan Riedmueller <s.riedmueller@phytec.de> | 2017-05-11 11:09:26 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-05-17 08:49:36 +0200 |
| commit | 366d0ce037eeae98778f89229f31b13f3a959207 (patch) | |
| tree | 8e4dce32bfaa846829474163e52492f9c1c73995 /arch | |
| parent | 7dd5deb8bf04db1ecffff65647475554d99cc830 (diff) | |
| download | barebox-366d0ce037eeae98778f89229f31b13f3a959207.tar.gz barebox-366d0ce037eeae98778f89229f31b13f3a959207.tar.xz | |
ARM: i.MX: Add i.MX6 ULL support
Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/imx.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/imx6.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-imx/include/mach/imx6.h | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/imx.c b/arch/arm/mach-imx/imx.c index 19907397f9..9400105c66 100644 --- a/arch/arm/mach-imx/imx.c +++ b/arch/arm/mach-imx/imx.c @@ -67,6 +67,8 @@ static int imx_soc_from_dt(void) return IMX_CPU_IMX6; if (of_machine_is_compatible("fsl,imx6ul")) return IMX_CPU_IMX6; + if (of_machine_is_compatible("fsl,imx6ull")) + return IMX_CPU_IMX6; if (of_machine_is_compatible("fsl,imx7s")) return IMX_CPU_IMX7; if (of_machine_is_compatible("fsl,imx7d")) diff --git a/arch/arm/mach-imx/imx6.c b/arch/arm/mach-imx/imx6.c index 44a8dbefd0..7b3fc1da27 100644 --- a/arch/arm/mach-imx/imx6.c +++ b/arch/arm/mach-imx/imx6.c @@ -160,6 +160,9 @@ int imx6_init(void) case IMX6_CPUTYPE_IMX6UL: cputypestr = "i.MX6 UltraLite"; break; + case IMX6_CPUTYPE_IMX6ULL: + cputypestr = "i.MX6 ULL"; + break; default: cputypestr = "unknown i.MX6"; break; diff --git a/arch/arm/mach-imx/include/mach/imx6.h b/arch/arm/mach-imx/include/mach/imx6.h index 327676bc69..6ad53433cb 100644 --- a/arch/arm/mach-imx/include/mach/imx6.h +++ b/arch/arm/mach-imx/include/mach/imx6.h @@ -18,6 +18,7 @@ void imx6_init_lowlevel(void); #define IMX6_CPUTYPE_IMX6D 0x263 #define IMX6_CPUTYPE_IMX6Q 0x463 #define IMX6_CPUTYPE_IMX6UL 0x164 +#define IMX6_CPUTYPE_IMX6ULL 0x165 #define SCU_CONFIG 0x04 @@ -82,6 +83,7 @@ DEFINE_MX6_CPU_TYPE(mx6d, IMX6_CPUTYPE_IMX6D); DEFINE_MX6_CPU_TYPE(mx6sx, IMX6_CPUTYPE_IMX6SX); DEFINE_MX6_CPU_TYPE(mx6sl, IMX6_CPUTYPE_IMX6SL); DEFINE_MX6_CPU_TYPE(mx6ul, IMX6_CPUTYPE_IMX6UL); +DEFINE_MX6_CPU_TYPE(mx6ull, IMX6_CPUTYPE_IMX6ULL); static inline int __imx6_cpu_revision(void) { |