diff options
| author | Tom Rini <trini@konsulko.com> | 2022-04-21 19:55:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-04-21 19:55:38 -0400 |
| commit | ea5583b90f9c162af6f2025718dc50ffbb6e4552 (patch) | |
| tree | 91f01f0434711bb9c31a311c0ba0e876c9627a8f /arch/arm/cpu/armv7/sunxi/psci.c | |
| parent | e50f66e364be80e02dd0834b84b830f3aade82ea (diff) | |
| parent | 151a030063898e5c8b03b40c3a96b073db0b0dc7 (diff) | |
Merge branch '2022-04-21-further-cleanups'
- Fix SPL_SYS_MALLOC_SIMPLE and non-SPL_FRAMEWORK boards (a large number
of PowerPC platforms)
- Remove duplication of crc16 functionality
- Migrate COUNTER_FREQUENCY to CONFIG_COUNTER_FREQUENCY and have it in
Kconfig
Diffstat (limited to 'arch/arm/cpu/armv7/sunxi/psci.c')
| -rw-r--r-- | arch/arm/cpu/armv7/sunxi/psci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/sunxi/psci.c b/arch/arm/cpu/armv7/sunxi/psci.c index 1ac50f558a4..d1bd6b9be41 100644 --- a/arch/arm/cpu/armv7/sunxi/psci.c +++ b/arch/arm/cpu/armv7/sunxi/psci.c @@ -57,7 +57,7 @@ static u32 __secure cp15_read_cntp_ctl(void) return val; } -#define ONE_MS (COUNTER_FREQUENCY / 1000) +#define ONE_MS (CONFIG_COUNTER_FREQUENCY / 1000) static void __secure __mdelay(u32 ms) { |