Merge branch 'for-next/timers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux into for-next/core

Conflicts:
	arch/arm64/Kconfig
	arch/arm64/include/asm/arch_timer.h

1 files changed, 11 insertions, 2 deletions

diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c
index 1b9ce0fdd81d..e88d4e7bdfc7 100644
--- a/arch/arm64/kernel/cpu_errata.c
+++ b/arch/arm64/kernel/cpu_errata.c
@@ -682,6 +682,16 @@ static const struct midr_range workaround_clean_cache[] = {
 };
 #endif
 
+#ifdef CONFIG_ARM64_ERRATUM_1188873
+static const struct midr_range erratum_1188873_list[] = {
+        /* Cortex-A76 r0p0 to r2p0 */
+        MIDR_RANGE(MIDR_CORTEX_A76, 0, 0, 2, 0),
+        /* Neoverse-N1 r0p0 to r2p0 */
+        MIDR_RANGE(MIDR_NEOVERSE_N1, 0, 0, 2, 0),
+        {},
+};
+#endif
+
 const struct arm64_cpu_capabilities arm64_errata[] = {
 #ifdef CONFIG_ARM64_WORKAROUND_CLEAN_CACHE
         {
@@ -801,10 +811,9 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
         },
 #ifdef CONFIG_ARM64_ERRATUM_1188873
         {
-                /* Cortex-A76 r0p0 to r2p0 */
                 .desc = "ARM erratum 1188873",
                 .capability = ARM64_WORKAROUND_1188873,
-                ERRATA_MIDR_RANGE(MIDR_CORTEX_A76, 0, 0, 2, 0),
+                ERRATA_MIDR_RANGE_LIST(erratum_1188873_list),
         },
 #endif
 #ifdef CONFIG_ARM64_ERRATUM_1165522