diff options
| author | Tom Rini <trini@konsulko.com> | 2015-07-03 08:36:29 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-07-03 08:41:02 -0400 |
| commit | 808bf7cf655a1caa5f48f6f3a6b274f4b83ab8b4 (patch) | |
| tree | 8f45f687f0205be120412d87a63c36bda6ee8ae0 /arch/arm/imx-common/timer.c | |
| parent | 891b487098ee2169a16b1bbb354aaef28aa90630 (diff) | |
| parent | aa5a0d98943e1b32109fd1fb325007c6cdcedc50 (diff) | |
| download | talos-obmc-uboot-808bf7cf655a1caa5f48f6f3a6b274f4b83ab8b4.tar.gz talos-obmc-uboot-808bf7cf655a1caa5f48f6f3a6b274f4b83ab8b4.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Conflicts:
configs/tbs2910_defconfig
configs/tqma6q_mba6_mmc_defconfig
configs/tqma6q_mba6_spi_defconfig
configs/tqma6s_mba6_mmc_defconfig
configs/tqma6s_mba6_spi_defconfig
include/configs/mx6_common.h
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/imx-common/timer.c')
| -rw-r--r-- | arch/arm/imx-common/timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/imx-common/timer.c b/arch/arm/imx-common/timer.c index e522990453..c12556addf 100644 --- a/arch/arm/imx-common/timer.c +++ b/arch/arm/imx-common/timer.c @@ -44,8 +44,8 @@ static inline int gpt_has_clk_source_osc(void) { #if defined(CONFIG_MX6) 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) || - is_cpu_type(MXC_CPU_MX6SOLO) || is_cpu_type(MXC_CPU_MX6SX)) + (soc_rev() > CHIP_REV_1_0)) || is_cpu_type(MXC_CPU_MX6DL) || + is_cpu_type(MXC_CPU_MX6SOLO) || is_cpu_type(MXC_CPU_MX6SX)) return 1; return 0; |
