colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

imx: mx6 correct is_soc_rev usage

Browse Source 
is_soc_rev should return a bool value, so use "==", but not "-",
change (is_soc_rev(CHIP_REV_1_0) > 0) to (soc_rev() > CHIP_REV_1_0).
This patch also add space between "&" for cpu_type(rev) macro.

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
This commit is contained in:
Peng Fan
2015-06-11 18:30:35 +08:00
committed by Stefano Babic
parent fc6e442568
commit b65d9d868e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/imx-common/timer.c
View File

@@ -44,7 +44,7 @@ static inline int gpt_has_clk_source_osc(void)
{ {
#if defined(CONFIG_MX6) #if defined(CONFIG_MX6)
if (((is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D)) && if (((is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D)) &&
(is_soc_rev(CHIP_REV_1_0) > 0)) || is_cpu_type(MXC_CPU_MX6DL) || (soc_rev() > CHIP_REV_1_0)) || is_cpu_type(MXC_CPU_MX6DL) ||
is_cpu_type(MXC_CPU_MX6SOLO) || is_cpu_type(MXC_CPU_MX6SX)) is_cpu_type(MXC_CPU_MX6SOLO) || is_cpu_type(MXC_CPU_MX6SX))
return 1; return 1;

2
arch/arm/include/asm/arch-mx6/sys_proto.h
View File

@@ -12,7 +12,7 @@
#include "../arch-imx/cpu.h" #include "../arch-imx/cpu.h"
#define soc_rev() (get_cpu_rev() & 0xFF) #define soc_rev() (get_cpu_rev() & 0xFF)
#define is_soc_rev(rev) (soc_rev() - rev) #define is_soc_rev(rev) (soc_rev() == rev)
u32 get_nr_cpus(void); u32 get_nr_cpus(void);
u32 get_cpu_rev(void); u32 get_cpu_rev(void);