diff options
| author | Jason Chen <jason.chen@linaro.org> | 2012-01-12 15:22:00 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2012-01-12 16:31:53 +0800 |
| commit | e14ae71cb07f8855101d391c697db66028285b48 (patch) | |
| tree | 079f11c292d40f156fcda9eeb970e008fd8a2379 | |
| parent | 2ec5606fe28649937ecbe1091d6634407c2702ed (diff) | |
| download | linux-linaro-e14ae71cb07f8855101d391c697db66028285b48.tar.gz | |
BASE: imx6q: add cpu_is_mx6q supporttmp
Signed-off-by: Jason Chen <jason.chen@linaro.org>
| -rw-r--r-- | arch/arm/mach-imx/mach-imx6q.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/mxc.h | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 3f46730ac06..377a5ba27db 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -165,6 +165,8 @@ static void __init imx6q_map_io(void) init_consistent_dma_size(SZ_64M); + mxc_set_cpu_type(MXC_CPU_MX6Q); + if (!system_rev) system_rev = 0x63000; } diff --git a/arch/arm/plat-mxc/include/mach/mxc.h b/arch/arm/plat-mxc/include/mach/mxc.h index a74b87db893..9497b966d74 100644 --- a/arch/arm/plat-mxc/include/mach/mxc.h +++ b/arch/arm/plat-mxc/include/mach/mxc.h @@ -35,6 +35,7 @@ #define MXC_CPU_MX50 50 #define MXC_CPU_MX51 51 #define MXC_CPU_MX53 53 +#define MXC_CPU_MX6Q 63 #define IMX_CHIP_REVISION_1_0 0x10 #define IMX_CHIP_REVISION_1_1 0x11 @@ -192,8 +193,19 @@ extern unsigned int __mxc_cpu_type; # define cpu_is_mx53() (0) #endif +#ifdef CONFIG_SOC_IMX6Q +# ifdef mxc_cpu_type +# undef mxc_cpu_type +# define mxc_cpu_type __mxc_cpu_type +# else +# define mxc_cpu_type MXC_CPU_MX6Q +# endif +# define cpu_is_mx6q() (mxc_cpu_type == MXC_CPU_MX6Q) +#else +# define cpu_is_mx6q() (0) +#endif + #define cpu_is_mx37() (0) -#define cpu_is_mx6q() (0) #ifndef __ASSEMBLY__ |