diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-31 13:34:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-31 13:34:06 -0700 |
| commit | be413ec746afc951c79d5907cf62ab6757330bdb (patch) | |
| tree | cbb33b708b767c3c7f769bf122faad495804bfb4 /include/linux | |
| parent | 602a0672869499fefa31b7f1e22f9d32c35fc7fe (diff) | |
| parent | de1fffd88600c5ee1c095c84b86484cd0329a9e8 (diff) | |
Merge tag 'hwmon-for-v6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck:
"Updated chip support in existing drivers:
- ina238: Support for INA228
- pmbus/tps53679: Support for TPS53685
- pmbus/adp1050: Support for adp1051, adp1055 and ltp8800
- corsair-psu: Support for HX1200i Series 2025
- pmbus/isl68137: Support for RAA229621
- asus-ec-sensors: Support for ProArt X870E-CREATOR WIFI and
Other notable changes:
- adt7475: Support for #pwm-cells = <3>
- amc6821: Cooling device support
- emc2305: Support for PWM frequency, polarity and output
- Add missing compatible entries to various devicetree bindings
And various other minor fixes and improvements"
* tag 'hwmon-for-v6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (34 commits)
dt-bindings: hwmon: Replace bouncing Alexandru Tachici emails
hwmon: (ina238) Add support for INA228
dt-bindings: Add INA228 to ina2xx devicetree bindings
hwmon: (ina238) Fix inconsistent whitespace
dt-bindings: hwmon: adt7475: Allow and recommend #pwm-cells = <3>
hwmon: (adt7475) Implement support for #pwm-cells = <3>
hwmon: (pmbus/tps53679) Add support for TPS53685
dt-bindings: trivial: Add tps53685 support
hwmon: (pmbus/adp1050) Add regulator support for ltp8800
hwmon: (pmbus/adp1050) Add support for adp1051, adp1055 and ltp8800
dt-bindings: hwmon: pmbus/adp1050: Add adp1051, adp1055 and ltp8800
hwmon: (max31827) use sysfs_emit() in temp1_resolution_show()
hwmon: (ltc4282) convert from round_rate() to determine_rate()
hwmon: (corsair-psu) add support for HX1200i Series 2025
dt-bindings: hwmon: pmbus: ti,ucd90320: Add missing compatibles
dt-bindings: hwmon: maxim,max20730: Add maxim,max20710 compatible
dt-bindings: hwmon: lltc,ltc2978: Add lltc,ltc713 compatible
dt-bindings: hwmon: ti,lm87: Add adi,adm1024 compatible
dt-bindings: hwmon: national,lm90: Add missing Dallas max6654 and onsemi nct72, nct214, and nct218
hwmon: (w83627ehf) make the read-only arrays 'bit' static const
...
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/platform_data/emc2305.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/platform_data/emc2305.h b/include/linux/platform_data/emc2305.h index 54d672dd6f7d..76043a97f975 100644 --- a/include/linux/platform_data/emc2305.h +++ b/include/linux/platform_data/emc2305.h @@ -9,14 +9,20 @@ * struct emc2305_platform_data - EMC2305 driver platform data * @max_state: maximum cooling state of the cooling device; * @pwm_num: number of active channels; + * @pwm_output_mask: PWM output mask + * @pwm_polarity_mask: PWM polarity mask * @pwm_separate: separate PWM settings for every channel; * @pwm_min: array of minimum PWM per channel; + * @pwm_freq: array of PWM frequency per channel */ struct emc2305_platform_data { u8 max_state; u8 pwm_num; + u8 pwm_output_mask; + u8 pwm_polarity_mask; bool pwm_separate; u8 pwm_min[EMC2305_PWM_MAX]; + u16 pwm_freq[EMC2305_PWM_MAX]; }; #endif |