diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-03-25 19:55:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-03-25 19:55:29 -0700 |
| commit | c07666e29be2487b99bbc1fbc109b5cdb57d1713 (patch) | |
| tree | 3a0f5c11581f2832f0816da2f1fa82f3578ae98b /include | |
| parent | 5e0c2cc4c35283e2ae7a0602d1fe85acf8ae6ccc (diff) | |
| parent | 2115cbeec8a3ccc69e3b7ecdf97b4472b0829cfc (diff) | |
Merge tag 'hwmon-for-v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck:
"New drivers:
- Driver for HTU31
- Congatec Board Controller monitoring driver
- Driver for TI INA233 Current and Power Monitor
Support for additional chips or boards in existing drivers:
- pmbus/ltc2978: Add support for LT717x and LTM4673
- asus-ec-sensors: Add PRIME X670E-PRO WIFI
- k10temp: Add support for cyan skillfish
- nct6683: Add customer ID for AMD BC-250
- lm90: Add support for NCT7716, NCT7717 and NCT7718
Other notable improvements in existing drivers:
- emc2305: Add devicetree support, and use
devm_thermal_of_cooling_device_register
- acpi_power_meter: Convert to with_info API
- dell-smm: Increase the number of fans
- pmbus/core: Optimize debugfs support and use i2c_client
debugfs directory
- hwmon core: Fix the missing of 'average' word in
hwmon_power_attr_templates
- Various drivers: Use per-client debugfs entry provided by
I2C subsystem"
* tag 'hwmon-for-v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (49 commits)
hwmon: emc2305: Use devm_thermal_of_cooling_device_register
hwmon: emc2305: Add OF support
dt-bindings: hwmon: Add Microchip emc2305 support
dt-bindings: hwmon: Drop stray blank line in the header
hwmon: (acpi_power_meter) Replace the deprecated hwmon_device_register
hwmon: add driver for HTU31
dt-bindings: hwmon: Add description for sensor HTU31
hwmon: Add driver for TI INA233 Current and Power Monitor
dt-bindings: hwmon: ti,ina2xx: Add INA233 device
hwmon: Add Congatec Board Controller monitoring driver
hwmon: (pmbus/ltc2978) add support for lt717x
dt-bindings: hwmon: ltc2978: add support for LT717x
hwmon: (pmbus/ltc2978) Add support for LT717x - docs
hwmon: (dell-smm) Increment the number of fans
hwmon: (ntc_thermistor) return error instead of clipping on OOB
hwmon: (pt5161l) Use per-client debugfs entry
hwmon: Fix the missing of 'average' word in hwmon_power_attr_templates
hwmon: (acpi_power_meter) Fix the fake power alarm reporting
hwmon: (gpio-fan) Add missing mutex locks
dt-bindings: hwmon: gpio-fan: Add optional regulator support
...
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 1a2594a38199..41dfb3b0d9b9 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -569,6 +569,7 @@ #define PCI_DEVICE_ID_AMD_17H_DF_F3 0x1463 #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F3 0x1493 +#define PCI_DEVICE_ID_AMD_17H_M40H_DF_F3 0x13f3 #define PCI_DEVICE_ID_AMD_17H_M60H_DF_F3 0x144b #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F3 0x1443 #define PCI_DEVICE_ID_AMD_17H_MA0H_DF_F3 0x1727 |