summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2013-04-12 16:21:26 +0200
committerMichal Simek <michal.simek@xilinx.com>2013-04-30 11:39:12 +0200
commit4b21284b8ceb50a7b3ba8bc69148e22ee7d4416f (patch)
treea0cebba01b224d3e8f6f7e63a8abd017122cf504 /arch
parente072b5f5dc17473933bfdf5b8aed7e4428d4ba75 (diff)
downloadu-boot-imx-4b21284b8ceb50a7b3ba8bc69148e22ee7d4416f.zip
u-boot-imx-4b21284b8ceb50a7b3ba8bc69148e22ee7d4416f.tar.gz
u-boot-imx-4b21284b8ceb50a7b3ba8bc69148e22ee7d4416f.tar.bz2
zynq: Move scutimer baseaddr to hardware.h
Move baseaddr to hardware.h to be shared between configurations. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Reviewed-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/cpu/armv7/zynq/timer.c3
-rw-r--r--arch/arm/include/asm/arch-zynq/hardware.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/zynq/timer.c b/arch/arm/cpu/armv7/zynq/timer.c
index 5d8bb24..8c4357d 100644
--- a/arch/arm/cpu/armv7/zynq/timer.c
+++ b/arch/arm/cpu/armv7/zynq/timer.c
@@ -44,6 +44,7 @@
#include <common.h>
#include <div64.h>
#include <asm/io.h>
+#include <asm/arch/hardware.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -54,7 +55,7 @@ struct scu_timer {
};
static struct scu_timer *timer_base =
- (struct scu_timer *) CONFIG_SCUTIMER_BASEADDR;
+ (struct scu_timer *)ZYNQ_SCUTIMER_BASEADDR;
#define SCUTIMER_CONTROL_PRESCALER_MASK 0x0000FF00 /* Prescaler */
#define SCUTIMER_CONTROL_PRESCALER_SHIFT 8
diff --git a/arch/arm/include/asm/arch-zynq/hardware.h b/arch/arm/include/asm/arch-zynq/hardware.h
index a99edbe..ccbf54e 100644
--- a/arch/arm/include/asm/arch-zynq/hardware.h
+++ b/arch/arm/include/asm/arch-zynq/hardware.h
@@ -26,6 +26,7 @@
#define ZYNQ_SYS_CTRL_BASEADDR 0xF8000000
#define ZYNQ_DEV_CFG_APB_BASEADDR 0xF8007000
#define ZYNQ_SCU_BASEADDR 0xF8F00000
+#define ZYNQ_SCUTIMER_BASEADDR 0xF8F00600
/* Reflect slcr offsets */
struct slcr_regs {