Implement plat_get_syscnt_freq2 on platforms
Replaced plat_get_syscnt_freq by plat_get_syscnt_freq2 on all upstream platforms. Change-Id: I3248f3f65a16dc5e9720012a05c35b9e3ba6abbe
This commit is contained in:
parent
d44863910c
commit
f3d3b316f8
|
@ -29,6 +29,7 @@
|
|||
*/
|
||||
#include <arch.h>
|
||||
#include <arch_helpers.h>
|
||||
#include <assert.h>
|
||||
#include <debug.h>
|
||||
#include <mmio.h>
|
||||
#include <plat_arm.h>
|
||||
|
@ -40,7 +41,14 @@ extern const mmap_region_t plat_arm_mmap[];
|
|||
/* Weak definitions may be overridden in specific ARM standard platform */
|
||||
#pragma weak plat_get_ns_image_entrypoint
|
||||
#pragma weak plat_arm_get_mmap
|
||||
|
||||
/* Conditionally provide a weak definition of plat_get_syscnt_freq2 to avoid
|
||||
* conflicts with the definition in plat/common. */
|
||||
#if ERROR_DEPRECATED
|
||||
#pragma weak plat_get_syscnt_freq2
|
||||
#else
|
||||
#pragma weak plat_get_syscnt_freq
|
||||
#endif
|
||||
|
||||
/*******************************************************************************
|
||||
* Macro generating the code for the function setting up the pagetables as per
|
||||
|
@ -164,9 +172,16 @@ const mmap_region_t *plat_arm_get_mmap(void)
|
|||
}
|
||||
|
||||
#ifdef ARM_SYS_CNTCTL_BASE
|
||||
|
||||
#if ERROR_DEPRECATED
|
||||
unsigned int plat_get_syscnt_freq2(void)
|
||||
{
|
||||
unsigned int counter_base_frequency
|
||||
#else
|
||||
unsigned long long plat_get_syscnt_freq(void)
|
||||
{
|
||||
unsigned long long counter_base_frequency;
|
||||
#endif /* ERROR_DEPRECATED */
|
||||
|
||||
/* Read the frequency from Frequency modes table */
|
||||
counter_base_frequency = mmio_read_32(ARM_SYS_CNTCTL_BASE + CNTFID_OFF);
|
||||
|
@ -177,4 +192,5 @@ unsigned long long plat_get_syscnt_freq(void)
|
|||
|
||||
return counter_base_frequency;
|
||||
}
|
||||
|
||||
#endif /* ARM_SYS_CNTCTL_BASE */
|
||||
|
|
|
@ -84,7 +84,7 @@ const mmap_region_t plat_mmap[] = {
|
|||
/* Define EL3 variants of the function initialising the MMU */
|
||||
DEFINE_CONFIGURE_MMU_EL(3)
|
||||
|
||||
unsigned long long plat_get_syscnt_freq(void)
|
||||
unsigned int plat_get_syscnt_freq2(void)
|
||||
{
|
||||
return SYS_COUNTER_FREQ_IN_TICKS;
|
||||
}
|
||||
|
|
|
@ -52,7 +52,6 @@ int32_t tegra_soc_validate_power_state(unsigned int power_state,
|
|||
|
||||
/* Declarations for plat_setup.c */
|
||||
const mmap_region_t *plat_get_mmio_map(void);
|
||||
unsigned long long plat_get_syscnt_freq(void);
|
||||
|
||||
/* Declarations for plat_secondary.c */
|
||||
void plat_secondary_setup(void);
|
||||
|
|
|
@ -74,7 +74,7 @@ const mmap_region_t *plat_get_mmio_map(void)
|
|||
return tegra_mmap;
|
||||
}
|
||||
|
||||
unsigned long long plat_get_syscnt_freq(void)
|
||||
unsigned int plat_get_syscnt_freq2(void)
|
||||
{
|
||||
return 12000000;
|
||||
}
|
||||
|
|
|
@ -80,7 +80,7 @@ const mmap_region_t *plat_get_mmio_map(void)
|
|||
/*******************************************************************************
|
||||
* Handler to get the System Counter Frequency
|
||||
******************************************************************************/
|
||||
unsigned long long plat_get_syscnt_freq(void)
|
||||
unsigned int plat_get_syscnt_freq2(void)
|
||||
{
|
||||
return 19200000;
|
||||
}
|
||||
|
|
|
@ -75,7 +75,7 @@ static const int cci_map[] = {
|
|||
/* Define EL3 variants of the function initialising the MMU */
|
||||
DEFINE_CONFIGURE_MMU_EL(3)
|
||||
|
||||
unsigned long long plat_get_syscnt_freq(void)
|
||||
unsigned int plat_get_syscnt_freq2(void)
|
||||
{
|
||||
return SYS_COUNTER_FREQ_IN_TICKS;
|
||||
}
|
||||
|
|
|
@ -297,9 +297,9 @@ void zynqmp_config_setup(void)
|
|||
mmio_write_32(IOU_SCNTRS_CONTROL, IOU_SCNTRS_CONTROL_EN);
|
||||
}
|
||||
|
||||
unsigned long long plat_get_syscnt_freq(void)
|
||||
unsigned int plat_get_syscnt_freq2(void)
|
||||
{
|
||||
unsigned long long counter_base_frequency;
|
||||
unsigned int counter_base_frequency;
|
||||
|
||||
/* FIXME: Read the frequency from Frequency modes table */
|
||||
counter_base_frequency = zynqmp_get_system_timer_freq();
|
||||
|
|
Loading…
Reference in New Issue