arm64: cputype: Remove duplicate Cortex-X1C definitions

JIRA: https://issues.redhat.com/browse/RHEL-101059

commit 52b49bd
Author: Mark Rutland <mark.rutland@arm.com>
Date: Thu, 18 Sep 2025 15:11:31 +0100

    We currently have duplicate definitions for ARM_CPU_PART_CORTEX_X1C and
    MIDR_CORTEX_X1C as a result of commits:

      58d245e ("arm64: cputype: Add Cortex-X1C definitions")
      efe676a ("arm64: proton-pack: Add new CPUs 'k' values for branch mitigation")

    Due to inconsistent sorting when adding entries, there was no textual
    conflict between the two patches.

    Delete the duplicate definitions added by the latter commit.

    The definitions in general are largely (but not entirely) in order of
    the MIDR_EL1.PartNum value rather than by CPU name, and the remaining
    Cortex-X1C definitions appear later in the list.

    For now I haven't sorted the remaining MIDR definitions to minimize
    churn. I intend to perform some larger cleanup of these in the near
    future which should supersede that anyhow.

    Signed-off-by: Mark Rutland <mark.rutland@arm.com>
    Cc: James Morse <james.morse@arm.com>
    Cc: Will Deacon <will@kernel.org>
    Cc: Catalin Marinas <catalin.marinas@arm.com>
    Signed-off-by: Will Deacon <will@kernel.org>

Signed-off-by: Mark Salter <msalter@redhat.com>

Author: mosalter

arch/arm64/include/asm/cputype.h

@@ -80,7 +80,6 @@
 #define ARM_CPU_PART_CORTEX_A78AE	0xD42
 #define ARM_CPU_PART_CORTEX_X1		0xD44
 #define ARM_CPU_PART_CORTEX_A510	0xD46
-#define ARM_CPU_PART_CORTEX_X1C		0xD4C
 #define ARM_CPU_PART_CORTEX_A520	0xD80
 #define ARM_CPU_PART_CORTEX_A710	0xD47
 #define ARM_CPU_PART_CORTEX_A715	0xD4D
@@ -166,7 +165,6 @@
 #define MIDR_CORTEX_A78AE	MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A78AE)
 #define MIDR_CORTEX_X1	MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X1)
 #define MIDR_CORTEX_A510 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A510)
-#define MIDR_CORTEX_X1C MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X1C)
 #define MIDR_CORTEX_A520 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A520)
 #define MIDR_CORTEX_A710 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A710)
 #define MIDR_CORTEX_A715 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A715)