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>

diff --git a/arch/arm/cpu/armv7/zynq/timer.c b/arch/arm/cpu/armv7/zynq/timer.c
index 5d8bb24096e7212f71688c84c160cb16be02efbc..8c4357de4202c1b8197b916c575165ed1e84facc 100644 (file)
--- 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 5fce0b1dd8ffac44609632c37e98dc6cf103fd39..6c9b97d703bc9f268d062fc21b3e49039c42230f 100644 (file)
--- 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 {

diff --git a/include/configs/petalogix-arm-auto.h b/include/configs/petalogix-arm-auto.h
index 3949a1a4c5f262e0508429d588f65d4d8f8ed475..08946e8510194feac3dda9525be4535315a96054 100644 (file)
--- a/include/configs/petalogix-arm-auto.h
+++ b/include/configs/petalogix-arm-auto.h
@@ -14,7 +14,6 @@
 #define XPSS_QSPI_LIN_BASEADDR         0xFC000000
 #define XPSS_DDR_CTRL_BASEADDR         0xF8006000
 
-#define CONFIG_SCUTIMER_BASEADDR       0xF8F00600
 #define CONFIG_CPU_FREQ_HZ     XPAR_CPU_CORTEXA9_CORE_CLOCK_FREQ_HZ
 
 /* Must be removed */

diff --git a/include/configs/zynq.h b/include/configs/zynq.h
index 2989e723e04c6f5633aa80d978570a553096e06b..11476894d32845e1766ce118750bf451a35c5808 100644 (file)
--- a/include/configs/zynq.h
+++ b/include/configs/zynq.h
@@ -50,9 +50,6 @@
 #define CONFIG_ZYNQ_SERIAL_BAUDRATE0   CONFIG_BAUDRATE
 #define CONFIG_ZYNQ_SERIAL_CLOCK0      50000000
 
-/* SCU timer address is hardcoded */
-#define CONFIG_SCUTIMER_BASEADDR       0xF8F00600
-
 /* Ethernet driver */
 #define CONFIG_NET_MULTI
 #define CONFIG_ZYNQ_GEM

diff --git a/include/configs/zynq_common.h b/include/configs/zynq_common.h
index 424598ce0e4d3447c21f7c17893a395efd71a2a2..807deaee62ed8ed93062fce9dd57482218b31822 100644 (file)
--- a/include/configs/zynq_common.h
+++ b/include/configs/zynq_common.h
@@ -77,8 +77,6 @@
 # define CONFIG_SYS_ENET
 #endif
 
-/* SCU timer address is hardcoded */
-#define CONFIG_SCUTIMER_BASEADDR       0xF8F00600
 #ifndef CONFIG_CPU_FREQ_HZ
 #define CONFIG_CPU_FREQ_HZ             800000000
 #endif