diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-29 22:20:45 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-29 22:20:45 +0300 |
| commit | 47d5cc5be396eca67cc89572957ff16f10fd768e (patch) | |
| tree | 1f7cc53be5c3d857a3a1724a8dd773997d20620b /Documentation/devicetree/bindings | |
| parent | 0fc7e74663447682c904fe375bb680b004ddaa14 (diff) | |
| parent | 6fbc4232a5ac944531bda397f3644d1cf66bdd13 (diff) | |
| download | linux-47d5cc5be396eca67cc89572957ff16f10fd768e.tar.xz | |
Merge tag 'hwmon-for-linus-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck:
- New driver for W83773G
- Fan control support for PMBus drivers
- Improvements and minor fixes in several drivers
* tag 'hwmon-for-linus-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (32 commits)
hwmon: (dell-smm) Disable fan support for Dell Vostro 3360
hwmon: (dell-smm) Disable fan support for Dell Inspiron 7720
hwmon: (dell-smm) Enable broken functionality via "force" module param
hwmon: (k10temp) Add temperature offset for Ryzen 1900X
hwmon: (lm75) Fix trailing semicolon
hwmon: (ina2xx) Fix access to uninitialized mutex
hwmon: (pmbus/ir35221) Remove unnecessary scaling
hwmon: (sht3x) wait predefined limits loading complete before access
hwmon: (pmbus/ibm-cffps) Add dependency on LEDS_CLASS
hwmon: (pmbus/cffps) Add led class device for power supply fault led
hwmon: (pmbus) cffps: Add PMBUS_SKIP_STATUS_CHECK
hwmon: (aspeed-pwm-tacho) Deassert reset in probe
dt-bindings: hwmon: aspeed-pwm-tacho: Add reset node
hwmon: (pmbus) cffps: Add debugfs entries
hwmon: (pmbus) Export pmbus device debugfs directory entry
hwmon: (w83773g) Fix fault detection and reporting
hwmon: (hih6130) Fix documentation of struct hih6130
hwmon: (iio_hwmon) Fix documentation of struct iio_hwmon_state
hwmon: (sht15) Fix parameter documentation of sht15_crc8()
hwmon: (sht21) Fix documentation of struct sht21
...
Diffstat (limited to 'Documentation/devicetree/bindings')
| -rw-r--r-- | Documentation/devicetree/bindings/hwmon/aspeed-pwm-tacho.txt | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/Documentation/devicetree/bindings/hwmon/aspeed-pwm-tacho.txt b/Documentation/devicetree/bindings/hwmon/aspeed-pwm-tacho.txt index 367c8203213b..3ac02988a1a5 100644 --- a/Documentation/devicetree/bindings/hwmon/aspeed-pwm-tacho.txt +++ b/Documentation/devicetree/bindings/hwmon/aspeed-pwm-tacho.txt @@ -22,8 +22,9 @@ Required properties for pwm-tacho node: - compatible : should be "aspeed,ast2400-pwm-tacho" for AST2400 and "aspeed,ast2500-pwm-tacho" for AST2500. -- clocks : a fixed clock providing input clock frequency(PWM - and Fan Tach clock) +- clocks : phandle to clock provider with the clock number in the second cell + +- resets : phandle to reset controller with the reset number in the second cell fan subnode format: =================== @@ -48,19 +49,14 @@ Required properties for each child node: Examples: -pwm_tacho_fixed_clk: fixedclk { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <24000000>; -}; - pwm_tacho: pwmtachocontroller@1e786000 { #address-cells = <1>; #size-cells = <1>; #cooling-cells = <2>; reg = <0x1E786000 0x1000>; compatible = "aspeed,ast2500-pwm-tacho"; - clocks = <&pwm_tacho_fixed_clk>; + clocks = <&syscon ASPEED_CLK_APB>; + resets = <&syscon ASPEED_RESET_PWM>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pwm0_default &pinctrl_pwm1_default>; |