diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-11-14 12:37:20 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-11-14 12:37:20 +0100 |
| commit | 8eb1fb3519b6c1ae6ddab114a7cdc86bb24da296 (patch) | |
| tree | a85ef526dca96e6c12df5cc33c935b854d77fb93 /arch/arm/mach-imx/imx.c | |
| parent | f55e379fca456444ade761358e8cce8657ea9672 (diff) | |
| parent | 764f84809fedd39fca75e2c8731ab181a421fd5b (diff) | |
| download | barebox-8eb1fb3519b6c1ae6ddab114a7cdc86bb24da296.tar.gz barebox-8eb1fb3519b6c1ae6ddab114a7cdc86bb24da296.tar.xz | |
Merge branch 'for-next/vybrid'
Diffstat (limited to 'arch/arm/mach-imx/imx.c')
| -rw-r--r-- | arch/arm/mach-imx/imx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/imx.c b/arch/arm/mach-imx/imx.c index 1d3f18c28d..952db007d9 100644 --- a/arch/arm/mach-imx/imx.c +++ b/arch/arm/mach-imx/imx.c @@ -65,6 +65,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,vf610")) + return IMX_CPU_VF610; return 0; } @@ -101,6 +103,8 @@ static int imx_init(void) ret = imx53_init(); else if (cpu_is_mx6()) ret = imx6_init(); + else if (cpu_is_vf610()) + ret = 0; else return -EINVAL; |