Commit 110213b8 authored by Tony Luck's avatar Tony Luck Committed by Dave Hansen
Browse files

x86/cpu: Fix FAM5_QUARK_X1000 to use X86_MATCH_VFM() 



This family 5 CPU escaped notice when cleaning up all the family 6
CPUs.

Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Link: https://lore.kernel.org/all/20241031185733.17327-1-tony.luck%40intel.com
parent e6e6a303

arch/x86/include/asm/intel-family.h

+0 −1
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ 
#define INTEL_XEON_PHI_KNM		IFM(6, 0x85) /* Knights Mill */



/* Family 5 */

#define INTEL_FAM5_QUARK_X1000		0x09 /* Quark X1000 SoC */

#define INTEL_QUARK_X1000		IFM(5, 0x09) /* Quark X1000 SoC */



/* Family 19 */

arch/x86/platform/efi/quirks.c

+1 −2
Original line number Diff line number Diff line
@@ -656,8 +656,7 @@ static int qrk_capsule_setup_info(struct capsule_info *cap_info, void **pkbuff, 
}



static const struct x86_cpu_id efi_capsule_quirk_ids[] = {

	X86_MATCH_VENDOR_FAM_MODEL(INTEL, 5, INTEL_FAM5_QUARK_X1000,

				   &qrk_capsule_setup_info),

	X86_MATCH_VFM(INTEL_QUARK_X1000, &qrk_capsule_setup_info),

	{ }

};

arch/x86/platform/intel-quark/imr.c

+1 −1
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ static void __init imr_fixup_memmap(struct imr_device *idev) 
}



static const struct x86_cpu_id imr_ids[] __initconst = {

	X86_MATCH_VENDOR_FAM_MODEL(INTEL, 5, INTEL_FAM5_QUARK_X1000, NULL),

	X86_MATCH_VFM(INTEL_QUARK_X1000, NULL),

	{}

};

arch/x86/platform/intel-quark/imr_selftest.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static void __init imr_self_test(void) 
}



static const struct x86_cpu_id imr_ids[] __initconst = {

	X86_MATCH_VENDOR_FAM_MODEL(INTEL, 5, INTEL_FAM5_QUARK_X1000, NULL),

	X86_MATCH_VFM(INTEL_QUARK_X1000, NULL),

	{}

};

drivers/thermal/intel/intel_quark_dts_thermal.c

+1 −1
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ static struct soc_sensor_entry *alloc_soc_dts(void) 
}



static const struct x86_cpu_id qrk_thermal_ids[] __initconst  = {

	X86_MATCH_VENDOR_FAM_MODEL(INTEL, 5, INTEL_FAM5_QUARK_X1000, NULL),

	X86_MATCH_VFM(INTEL_QUARK_X1000, NULL),

	{}

};

MODULE_DEVICE_TABLE(x86cpu, qrk_thermal_ids);