From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Dec 2020 00:06:14 +0000 (-0800)
Subject: Merge tag 'hwmon-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck... 
X-Git-Tag: accepted/tizen/unified/20230118.172025~8307
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0f97458173a23c8f218f6041767d0a145a13abe6;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'hwmon-for-v5.11' of git://git./linux/kernel/git/groeck/linux-staging

Pull hwmon updates from Guenter Roeck:
 "New drivers:
   - SB-TSI sensors
   - Lineat Technology LTC2992
   - Delta power supplies Q54SJ108A2
   - Maxim MAX127
   - Corsair PSU
   - STMicroelectronics PM6764 Voltage Regulator

  New chip support:
   - P10 added to fsi/occ driver
   - NCT6687D added to nct6883 driver
   - Intel-based Xserves added to applesmc driver
   - AMD family 19h model 01h added to amd_energy driver

  And various minor bug fixes and improvements"

* tag 'hwmon-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (41 commits)
  dt-bindings: (hwmon/sbtsi_temp) Add SB-TSI hwmon driver bindings
  hwmon: (sbtsi) Add documentation
  hwmon: (sbtsi) Add basic support for SB-TSI sensors
  hwmon: (iio_hwmon) Drop bogus __refdata annotation
  hwmon: (xgene) Drop bogus __refdata annotation
  dt-bindings: hwmon: convert AD ADM1275 bindings to dt-schema
  hwmon: (occ) Add new temperature sensor type
  fsi: occ: Add support for P10
  dt-bindings: fsi: Add P10 OCC device documentation
  dt-bindings: hwmon: convert TI ADS7828 bindings to dt-schema
  dt-bindings: hwmon: convert AD AD741x bindings to dt-schema
  dt-bindings: hwmon: convert TI INA2xx bindings to dt-schema
  hwmon: (ltc2992) Fix less than zero comparisons with an unsigned integer
  hwmon: (pmbus/q54sj108a2) Correct title underline length
  dt-bindings: hwmon: Add documentation for ltc2992
  hwmon: (ltc2992) Add support for GPIOs.
  hwmon: (ltc2992) Add support
  hwmon: (pmbus) Driver for Delta power supplies Q54SJ108A2
  hwmon: Add driver for STMicroelectronics PM6764 Voltage Regulator
  hwmon: (nct6683) Support NCT6687D.
  ...
---

0f97458173a23c8f218f6041767d0a145a13abe6
diff --cc Documentation/devicetree/bindings/trivial-devices.yaml
index 52a7f79,1b1fa04..7506713
--- a/Documentation/devicetree/bindings/trivial-devices.yaml
+++ b/Documentation/devicetree/bindings/trivial-devices.yaml
@@@ -254,22 -350,8 +254,18 @@@ properties
            - st,24c256
              # Ambient Light Sensor with SMBUS/Two Wire Serial Interface
            - taos,tsl2550
-             # 8-Channels, 12-bit ADC
-           - ti,ads7828
-             # 8-Channels, 8-bit ADC
-           - ti,ads7830
              # Temperature Monitoring and Fan Control
            - ti,amc6821
 +            # Temperature and humidity sensor with i2c interface
 +          - ti,hdc1000
 +            # Temperature and humidity sensor with i2c interface
 +          - ti,hdc1008
 +            # Temperature and humidity sensor with i2c interface
 +          - ti,hdc1010
 +            # Temperature and humidity sensor with i2c interface
 +          - ti,hdc1050
 +            # Temperature and humidity sensor with i2c interface
 +          - ti,hdc1080
              # Temperature sensor with 2-wire interface
            - ti,lm73
              # Temperature sensor with integrated fan control