diff options
| author | Tom Rini <trini@ti.com> | 2014-10-06 15:17:13 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-06 15:17:13 -0400 |
| commit | 04de09f89bbc647d5b72db3512d1af1475a13bbd (patch) | |
| tree | 601e5dbe3def2dee6f7b3dfee680b3aee372d35f /arch/arm/cpu/armv7/socfpga/timer.c | |
| parent | 91693055995733e268874ae75568ae316233e116 (diff) | |
| parent | 2f210639c4f003b0d5310273979441f1bfc88eae (diff) | |
Merge branch 'topic/arm/socfpga-20141006' of git://git.denx.de/u-boot-socfpga
Fix a trivial conflict in dw_mmc.c after talking with Marek.
Conflicts:
drivers/mmc/dw_mmc.c
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/arm/cpu/armv7/socfpga/timer.c')
| -rw-r--r-- | arch/arm/cpu/armv7/socfpga/timer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/socfpga/timer.c b/arch/arm/cpu/armv7/socfpga/timer.c index 58fc789e645..253cde39d11 100644 --- a/arch/arm/cpu/armv7/socfpga/timer.c +++ b/arch/arm/cpu/armv7/socfpga/timer.c @@ -8,6 +8,8 @@ #include <asm/io.h> #include <asm/arch/timer.h> +#define TIMER_LOAD_VAL 0xFFFFFFFF + static const struct socfpga_timer *timer_base = (void *)CONFIG_SYS_TIMERBASE; /* |