diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-06-14 09:29:53 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-06-14 09:29:53 +0200 |
| commit | 442f6346d2c52259f618b0f7b2025ea8fb5ab336 (patch) | |
| tree | 9bfbecd9f9506c2d535c0851bf809ca60d8f178c /arch/arm/mach-imx/imx.c | |
| parent | 4a62a18d33e39f00d717c4aa314697dca924cf3f (diff) | |
| parent | 332eedd6e75c57c3f4acea1b3045f628a7a2f349 (diff) | |
| download | barebox-442f6346d2c52259f618b0f7b2025ea8fb5ab336.tar.gz barebox-442f6346d2c52259f618b0f7b2025ea8fb5ab336.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'arch/arm/mach-imx/imx.c')
| -rw-r--r-- | arch/arm/mach-imx/imx.c | 2 |
1 files changed, 2 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")) |