Commit a52a0b39 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v6.9-4' of... 

Merge tag 'platform-drivers-x86-v6.9-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86

Pull x86 platform driver fix from Ilpo Järvinen:

 - Add Grand Ridge to HPM CPU list

* tag 'platform-drivers-x86-v6.9-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  platform/x86: ISST: Add Grand Ridge to HPM CPU list
parents e5c8fc59 515a3c3a

drivers/platform/x86/intel/speed_select_if/isst_if_common.c

+1 −0
Original line number Diff line number Diff line
@@ -721,6 +721,7 @@ static struct miscdevice isst_if_char_driver = { 
static const struct x86_cpu_id hpm_cpu_ids[] = {

	X86_MATCH_INTEL_FAM6_MODEL(GRANITERAPIDS_D,	NULL),

	X86_MATCH_INTEL_FAM6_MODEL(GRANITERAPIDS_X,	NULL),

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_CRESTMONT,	NULL),

	X86_MATCH_INTEL_FAM6_MODEL(ATOM_CRESTMONT_X,	NULL),

	{}

};