diff options
| author | Tony Luck <tony.luck@intel.com> | 2024-05-29 10:19:20 -0700 |
|---|---|---|
| committer | Iwona Winiarska <iwona.winiarska@intel.com> | 2024-06-17 15:15:46 +0200 |
| commit | a43b9ec091b1b1924ea18883a715e5aadba2543e (patch) | |
| tree | bdecdd1ed7982fe55a7adde0ecbf767a839007cb /include/linux/peci.h | |
| parent | 6ba59ff4227927d3a8530fc2973b80e94b54d58f (diff) | |
peci, hwmon: Switch to new Intel CPU model defines
Update peci subsystem to use the same vendor-family-model
combined definition that core x86 code uses.
Signed-off-by: Tony Luck <tony.luck@intel.com>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Iwona Winiarska <iwona.winiarska@intel.com>
Link: https://lore.kernel.org/r/20240529171920.62571-1-tony.luck@intel.com
Signed-off-by: Iwona Winiarska <iwona.winiarska@intel.com>
Diffstat (limited to 'include/linux/peci.h')
| -rw-r--r-- | include/linux/peci.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/peci.h b/include/linux/peci.h index 90e241458ef6..3e0bc37591d6 100644 --- a/include/linux/peci.h +++ b/include/linux/peci.h @@ -59,8 +59,7 @@ static inline struct peci_controller *to_peci_controller(void *d) * struct peci_device - PECI device * @dev: device object to register PECI device to the device model * @info: PECI device characteristics - * @info.family: device family - * @info.model: device model + * @info.x86_vfm: device vendor-family-model * @info.peci_revision: PECI revision supported by the PECI device * @info.socket_id: the socket ID represented by the PECI device * @addr: address used on the PECI bus connected to the parent controller @@ -73,8 +72,7 @@ static inline struct peci_controller *to_peci_controller(void *d) struct peci_device { struct device dev; struct { - u16 family; - u8 model; + u32 x86_vfm; u8 peci_revision; u8 socket_id; } info; |