Merge "arm_fpga: Remove bogus timer initialisation" into integration

plat/arm/board/arm_fpga/fpga_bl31_setup.c

@@ -56,7 +56,6 @@ void bl31_platform_setup(void)
 
 	/* Write frequency to CNTCRL and initialize timer */
 	generic_delay_timer_init();
-	mmio_write_32(FPGA_TIMER_BASE, ((1 << 8) | 1UL));
 }
 
 entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type)

plat/arm/board/arm_fpga/fpga_def.h

@@ -36,6 +36,5 @@
 #define PLAT_FPGA_CRASH_UART_CLK_IN_HZ		PLAT_FPGA_BOOT_UART_CLK_IN_HZ
 
 #define FPGA_TIMER_FREQUENCY			10000000
-#define FPGA_TIMER_BASE				0x2a830000
 
 #endif