diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-08 11:53:30 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-08 11:53:30 +0300 |
| commit | f90bebb36a0831f5769b65e45e39dd7bc5621a7e (patch) | |
| tree | c047d1748b3b0965dc7340e502b9becc2b0da368 /drivers/peci/cpu.c | |
| parent | abe8ff435fb613b6afa80fa4718c6302573464df (diff) | |
| parent | d7c99890fe06a170c77af12b0c105babb3a47a04 (diff) | |
| download | linux-f90bebb36a0831f5769b65e45e39dd7bc5621a7e.tar.xz | |
Merge tag 'peci-next-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/iwi/linux into char-misc-next
Iwona writes:
Update peci-next for v6.6-rc1
* Add Intel Sapphire Rapids support.
* Add Nuvoton controller driver.
* tag 'peci-next-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/iwi/linux:
arm64: dts: nuvoton: Add PECI controller node
ARM: dts: nuvoton: Add PECI controller node
peci: Add peci-npcm controller driver
dt-bindings: Add bindings for peci-npcm
hwmon: (peci/dimmtemp) Add Sapphire Rapids support
hwmon: (peci/cputemp) Add Intel Sapphire Rapids support
peci: cpu: Add Intel Sapphire Rapids support
Diffstat (limited to 'drivers/peci/cpu.c')
| -rw-r--r-- | drivers/peci/cpu.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/peci/cpu.c b/drivers/peci/cpu.c index de4a7b3e5966..bd990acd92b8 100644 --- a/drivers/peci/cpu.c +++ b/drivers/peci/cpu.c @@ -323,6 +323,11 @@ static const struct peci_device_id peci_cpu_device_ids[] = { .model = INTEL_FAM6_ICELAKE_D, .data = "icxd", }, + { /* Sapphire Rapids Xeon */ + .family = 6, + .model = INTEL_FAM6_SAPPHIRERAPIDS_X, + .data = "spr", + }, { } }; MODULE_DEVICE_TABLE(peci, peci_cpu_device_ids); |