Commit 7aefd944 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging 

Pull hwmon updates from Guenter Roeck:

 - Add driver for Intersil ISL68137 PWM Controller

 - Add driver for Lochnagar 2

 - Add driver for Infineon IR38064 Voltage Regulator

 - Add support for TMP75B to lm75 driver

 - Convert documentation to ReST format

 - Use request_muxed_region for Super-IO accesses in several drivers

 - Add 'samples' attribute to ABI, and start using it

 - Add support for custom sysfs attributes to pmbus drivers (used in
   ISL68137 driver)

 - Introduce HWMON_CHANNEL_INFO macro

 - Automated changes:
      - Use permission specific [SENSOR_][DEVICE_]ATTR variants
      - Fix build warnings due to unused of_device_id structures
      - Use HWMON_CHANNEL_INFO macro

 - Various minor improvements and fixes

* tag 'hwmon-for-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (125 commits)
  hwmon: (lm75) Add support for TMP75B
  dt-bindings: hwmon: Add tmp75b to lm75.txt
  hwmon: (s3c) Use dev_get_drvdata()
  hwmon: (max6650) Drop call to thermal_cdev_update
  docs: hwmon: remove the extension from .rst files
  docs: hwmon: convert three docs to ReST format
  hwmon: (max6650) add thermal cooling device capability
  hwmon: (ina3221) Add voltage conversion time settings
  hwmon: (ina3221) Do not read-back to cache reg_config
  docs: hwmon: Add an index file and rename docs to *.rst
  docs: hwmon: convert remaining files to ReST format
  docs: hwmon: misc files: convert to ReST format
  docs: hwmon: pmbus files: convert to ReST format
  docs: hwmon: k8temp, w83793: convert to ReST format
  docs: hwmon: da9052, da9055: convert to ReST format
  docs: hwmon: wm831x, wm8350: convert to ReST format
  docs: hwmon: dme1737, vt1211: convert to ReST format
  docs: hwmon: ads1015: convert to ReST format
  docs: hwmon: asc7621: convert to ReST format
  docs: hwmon: ibmpowernv: convert to ReST format
  ...
parents ffa6f55e 39abe9d8

Documentation/devicetree/bindings/hwmon/cirrus,lochnagar.txt

0 → 100644
+26 −0
Original line number Diff line number Diff line 
Cirrus Logic Lochnagar Audio Development Board



Lochnagar is an evaluation and development board for Cirrus Logic

Smart CODEC and Amp devices. It allows the connection of most Cirrus

Logic devices on mini-cards, as well as allowing connection of

various application processor systems to provide a full evaluation

platform.  Audio system topology, clocking and power can all be

controlled through the Lochnagar, allowing the device under test

to be used in a variety of possible use cases.



This binding document describes the binding for the hardware monitor

portion of the driver.



This binding must be part of the Lochnagar MFD binding:

  [4] ../mfd/cirrus,lochnagar.txt



Required properties:



  - compatible : One of the following strings:

                 "cirrus,lochnagar2-hwmon"



Example:



lochnagar-hwmon {

	compatible = "cirrus,lochnagar2-hwmon";

};

Documentation/devicetree/bindings/hwmon/g762.txt

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ If an optional property is not set in .dts file, then current value is kept 
unmodified (e.g. u-boot installed value).



Additional information on operational parameters for the device is available

in Documentation/hwmon/g762. A detailed datasheet for the device is available

in Documentation/hwmon/g762.rst. A detailed datasheet for the device is available

at http://natisbad.org/NAS/refs/GMT_EDS-762_763-080710-0.2.pdf.



Example g762 node:

Documentation/devicetree/bindings/hwmon/lm75.txt

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ Required properties: 
		"ti,tmp175",

		"ti,tmp275",

		"ti,tmp75",

		"ti,tmp75b",

		"ti,tmp75c",



- reg: I2C bus address of the device

Documentation/devicetree/bindings/hwmon/pwm-fan.txt

+20 −1
Original line number Diff line number Diff line
@@ -8,6 +8,15 @@ Required properties: 


Optional properties:

- fan-supply		: phandle to the regulator that provides power to the fan

- interrupts		: This contains a single interrupt specifier which

			  describes the tachometer output of the fan as an

			  interrupt source. The output signal must generate a

			  defined number of interrupts per fan revolution, which

			  require that it must be self resetting edge interrupts.

			  See interrupt-controller/interrupts.txt for the format.

- pulses-per-revolution : define the tachometer pulses per fan revolution as

			  an integer (default is 2 interrupts per revolution).

			  The value must be greater than zero.



Example:

	fan0: pwm-fan {
@@ -38,3 +47,13 @@ Example: 
					};

			     };

		};



Example 2:

	fan0: pwm-fan {

		compatible = "pwm-fan";

		pwms = <&pwm 0 40000 0>;

		fan-supply = <&reg_fan>;

		interrupt-parent = <&gpio5>;

		interrupts = <1 IRQ_TYPE_EDGE_FALLING>;

		pulses-per-revolution = <2>;

	};

Documentation/hwmon/ab8500→Documentation/hwmon/ab8500.rst

+7 −3
Original line number Diff line number Diff line
@@ -2,19 +2,23 @@ Kernel driver ab8500 
====================



Supported chips:



  * ST-Ericsson AB8500



    Prefix: 'ab8500'



    Addresses scanned: -



    Datasheet: http://www.stericsson.com/developers/documentation.jsp



Authors:

        Martin Persson <martin.persson@stericsson.com>

        Hongbo Zhang <hongbo.zhang@linaro.org>

	- Martin Persson <martin.persson@stericsson.com>

	- Hongbo Zhang <hongbo.zhang@linaro.org>



Description

-----------



See also Documentation/hwmon/abx500. This is the ST-Ericsson AB8500 specific

See also Documentation/hwmon/abx500.rst. This is the ST-Ericsson AB8500 specific

driver.



Currently only the AB8500 internal sensor and one external sensor for battery

CRA Git | Maintained and supported by SUSTech CRA and CCSE