diff --git a/arch/arm64/src/common/arm64_gicv2.c b/arch/arm64/src/common/arm64_gicv2.c
index 6a1227972a3..11e695c428d 100644
--- a/arch/arm64/src/common/arm64_gicv2.c
+++ b/arch/arm64/src/common/arm64_gicv2.c
@@ -756,13 +756,13 @@ static int gic_validate_dist_version(void)
 {
   uint32_t  reg;
 
-  /* Read the Peripheral ID2 Register (ICPIDR2) */
+  /* Read the CPU Interface Implementer ID Register */
 
-  reg = getreg32(GIC_ICDPIDR(GIC_ICPIDR2)) & GICD_PIDR2_ARCH_MASK;
+  reg = getreg32(GIC_ICCIDR) & GIC_ICCIDR_ARCHNO_MASK;
 
   /* GIC Version should be 2 */
 
-  if (reg == GICD_PIDR2_ARCH_GICV2)
+  if (reg == (0x2 << GIC_ICCIDR_ARCHNO_SHIFT))
     {
       sinfo("GICv2 detected\n");
     }