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/include/mach/generic.h | |
| 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/include/mach/generic.h')
| -rw-r--r-- | arch/arm/mach-imx/include/mach/generic.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/include/mach/generic.h b/arch/arm/mach-imx/include/mach/generic.h index 7c275dff84..34194509e8 100644 --- a/arch/arm/mach-imx/include/mach/generic.h +++ b/arch/arm/mach-imx/include/mach/generic.h @@ -45,6 +45,7 @@ int imx6_devices_init(void); void imx5_cpu_lowlevel_init(void); void imx6_cpu_lowlevel_init(void); +void vf610_cpu_lowlevel_init(void); /* There's a off-by-one betweem the gpio bank number and the gpiochip */ /* range e.g. GPIO_1_5 is gpio 5 under linux */ @@ -173,6 +174,18 @@ extern unsigned int __imx_cpu_type; # define cpu_is_mx6() (0) #endif +#ifdef CONFIG_ARCH_VF610 +# ifdef imx_cpu_type +# undef imx_cpu_type +# define imx_cpu_type __imx_cpu_type +# else +# define imx_cpu_type IMX_CPU_VF610 +# endif +# define cpu_is_vf610() (imx_cpu_type == IMX_CPU_VF610) +#else +# define cpu_is_vf610() (0) +#endif + #define cpu_is_mx23() (0) #define cpu_is_mx28() (0) |