Replace Rockchip delay timer by generic one
Use the generic delay timer instead of having a specific platform file for configuring it. Change-Id: Ifa68b9c97cd96ae1190cee74d22d729af95e4537
This commit is contained in:
parent
1d0b990e9d
commit
6704f425dd
|
@ -33,6 +33,7 @@
|
||||||
#include <bl_common.h>
|
#include <bl_common.h>
|
||||||
#include <console.h>
|
#include <console.h>
|
||||||
#include <debug.h>
|
#include <debug.h>
|
||||||
|
#include <generic_delay_timer.h>
|
||||||
#include <mmio.h>
|
#include <mmio.h>
|
||||||
#include <platform.h>
|
#include <platform.h>
|
||||||
#include <plat_private.h>
|
#include <plat_private.h>
|
||||||
|
@ -126,7 +127,7 @@ void bl31_early_platform_setup(bl31_params_t *from_bl2,
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
void bl31_platform_setup(void)
|
void bl31_platform_setup(void)
|
||||||
{
|
{
|
||||||
plat_delay_timer_init();
|
generic_delay_timer_init();
|
||||||
plat_rockchip_soc_init();
|
plat_rockchip_soc_init();
|
||||||
|
|
||||||
/* Initialize the gic cpu and distributor interfaces */
|
/* Initialize the gic cpu and distributor interfaces */
|
||||||
|
|
|
@ -1,54 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2016, ARM Limited and Contributors. All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
*
|
|
||||||
* Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* Neither the name of ARM nor the names of its contributors may be used
|
|
||||||
* to endorse or promote products derived from this software without specific
|
|
||||||
* prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
||||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
||||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
||||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
|
||||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
||||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
||||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
||||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
||||||
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
||||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
||||||
* POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <arch_helpers.h>
|
|
||||||
#include <delay_timer.h>
|
|
||||||
#include <platform_def.h>
|
|
||||||
|
|
||||||
static uint32_t plat_get_timer_value(void)
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
* Generic delay timer implementation expects the timer to be a down
|
|
||||||
* counter. We apply bitwise NOT operator to the tick values returned
|
|
||||||
* by read_cntpct_el0() to simulate the down counter.
|
|
||||||
*/
|
|
||||||
return (uint32_t)(~read_cntpct_el0());
|
|
||||||
}
|
|
||||||
|
|
||||||
static const timer_ops_t plat_timer_ops = {
|
|
||||||
.get_timer_value = plat_get_timer_value,
|
|
||||||
.clk_mult = 1,
|
|
||||||
.clk_div = SYS_COUNTER_FREQ_IN_MHZ,
|
|
||||||
};
|
|
||||||
|
|
||||||
void plat_delay_timer_init(void)
|
|
||||||
{
|
|
||||||
timer_init(&plat_timer_ops);
|
|
||||||
}
|
|
|
@ -58,13 +58,13 @@ BL31_SOURCES += ${RK_GIC_SOURCES} \
|
||||||
drivers/console/console.S \
|
drivers/console/console.S \
|
||||||
drivers/ti/uart/16550_console.S \
|
drivers/ti/uart/16550_console.S \
|
||||||
drivers/delay_timer/delay_timer.c \
|
drivers/delay_timer/delay_timer.c \
|
||||||
|
drivers/delay_timer/generic_delay_timer.c \
|
||||||
lib/cpus/aarch64/cortex_a53.S \
|
lib/cpus/aarch64/cortex_a53.S \
|
||||||
plat/common/aarch64/platform_mp_stack.S \
|
plat/common/aarch64/platform_mp_stack.S \
|
||||||
${RK_PLAT_COMMON}/aarch64/plat_helpers.S \
|
${RK_PLAT_COMMON}/aarch64/plat_helpers.S \
|
||||||
${RK_PLAT_COMMON}/bl31_plat_setup.c \
|
${RK_PLAT_COMMON}/bl31_plat_setup.c \
|
||||||
${RK_PLAT_COMMON}/pmusram/pmu_sram_cpus_on.S \
|
${RK_PLAT_COMMON}/pmusram/pmu_sram_cpus_on.S \
|
||||||
${RK_PLAT_COMMON}/pmusram/pmu_sram.c \
|
${RK_PLAT_COMMON}/pmusram/pmu_sram.c \
|
||||||
${RK_PLAT_COMMON}/plat_delay_timer.c \
|
|
||||||
${RK_PLAT_COMMON}/plat_pm.c \
|
${RK_PLAT_COMMON}/plat_pm.c \
|
||||||
${RK_PLAT_COMMON}/plat_topology.c \
|
${RK_PLAT_COMMON}/plat_topology.c \
|
||||||
${RK_PLAT_COMMON}/aarch64/platform_common.c \
|
${RK_PLAT_COMMON}/aarch64/platform_common.c \
|
||||||
|
|
|
@ -89,7 +89,6 @@
|
||||||
* System counter frequency related constants
|
* System counter frequency related constants
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
#define SYS_COUNTER_FREQ_IN_TICKS 24000000
|
#define SYS_COUNTER_FREQ_IN_TICKS 24000000
|
||||||
#define SYS_COUNTER_FREQ_IN_MHZ 24
|
|
||||||
|
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
* GIC-400 & interrupt handling related constants
|
* GIC-400 & interrupt handling related constants
|
||||||
|
|
|
@ -57,6 +57,7 @@ BL31_SOURCES += ${RK_GIC_SOURCES}
|
||||||
drivers/console/console.S \
|
drivers/console/console.S \
|
||||||
drivers/ti/uart/16550_console.S \
|
drivers/ti/uart/16550_console.S \
|
||||||
drivers/delay_timer/delay_timer.c \
|
drivers/delay_timer/delay_timer.c \
|
||||||
|
drivers/delay_timer/generic_delay_timer.c \
|
||||||
lib/cpus/aarch64/cortex_a53.S \
|
lib/cpus/aarch64/cortex_a53.S \
|
||||||
lib/cpus/aarch64/cortex_a72.S \
|
lib/cpus/aarch64/cortex_a72.S \
|
||||||
plat/common/aarch64/platform_mp_stack.S \
|
plat/common/aarch64/platform_mp_stack.S \
|
||||||
|
@ -64,7 +65,6 @@ BL31_SOURCES += ${RK_GIC_SOURCES}
|
||||||
${RK_PLAT_COMMON}/bl31_plat_setup.c \
|
${RK_PLAT_COMMON}/bl31_plat_setup.c \
|
||||||
${RK_PLAT_COMMON}/pmusram/pmu_sram_cpus_on.S \
|
${RK_PLAT_COMMON}/pmusram/pmu_sram_cpus_on.S \
|
||||||
${RK_PLAT_COMMON}/pmusram/pmu_sram.c \
|
${RK_PLAT_COMMON}/pmusram/pmu_sram.c \
|
||||||
${RK_PLAT_COMMON}/plat_delay_timer.c \
|
|
||||||
${RK_PLAT_COMMON}/plat_pm.c \
|
${RK_PLAT_COMMON}/plat_pm.c \
|
||||||
${RK_PLAT_COMMON}/plat_topology.c \
|
${RK_PLAT_COMMON}/plat_topology.c \
|
||||||
${RK_PLAT_COMMON}/aarch64/platform_common.c \
|
${RK_PLAT_COMMON}/aarch64/platform_common.c \
|
||||||
|
|
|
@ -89,7 +89,6 @@
|
||||||
* System counter frequency related constants
|
* System counter frequency related constants
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
#define SYS_COUNTER_FREQ_IN_TICKS 24000000
|
#define SYS_COUNTER_FREQ_IN_TICKS 24000000
|
||||||
#define SYS_COUNTER_FREQ_IN_MHZ 24
|
|
||||||
|
|
||||||
/* Base rockchip_platform compatible GIC memory map */
|
/* Base rockchip_platform compatible GIC memory map */
|
||||||
#define BASE_GICD_BASE (GIC500_BASE)
|
#define BASE_GICD_BASE (GIC500_BASE)
|
||||||
|
|
Loading…
Reference in New Issue