Commit f0718cea authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-linus-v4.6' of... 

Merge tag 'hwmon-for-linus-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon updates from Guenter Roeck:
 - New drivers for NSA320 and LTC2990
 - Added support for ADM1278 to adm1275 driver
 - Added support for ncpXXxh103 to ntc_thermistor driver
 - Renamed vexpress hwmon implementation
 - Minor cleanups and improvements

* tag 'hwmon-for-linus-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: Create an NSA320 hardware monitoring driver
  hwmon: Define binding for the nsa320-hwmon driver
  hwmon: (adm1275) Add support for ADM1278
  hwmon: (ntc_thermistor) Add support for ncpXXxh103
  Doc: hwmon: Fix typo "montoring" in hwmon
  ARM: dts: vfxxx: Add iio_hwmon node for ADC temperature channel
  ARM: dts: Change iio_hwmon nodes to use hypen in node names
  hwmon: (iio_hwmon) Allow the driver to accept hypen in device tree node names
  hwmon: Add LTC2990 sensor driver
  hwmon: (vexpress) rename vexpress hwmon implementation
parents 555f8160 630300d5

Documentation/devicetree/bindings/hwmon/nsa320-mcu.txt

0 → 100644
+20 −0
Original line number Diff line number Diff line 
Bindings for the fan / temperature monitor microcontroller used on

the Zyxel NSA 320 and several subsequent models.



Required properties:

- compatible	: "zyxel,nsa320-mcu"

- data-gpios	: The GPIO pin connected to the data line on the MCU

- clk-gpios	: The GPIO pin connected to the clock line on the MCU

- act-gpios	: The GPIO pin connected to the active line on the MCU



Example:



	hwmon {

		compatible = "zyxel,nsa320-mcu";

		pinctrl-0 = <&pmx_mcu_data &pmx_mcu_clk &pmx_mcu_act>;

		pinctrl-names = "default";



		data-gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;

		clk-gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;

		act-gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;

	};

Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Requires node properties: 
	"murata,ncp03wb473"

	"murata,ncp15wl333"

	"murata,ncp03wf104"

	"murata,ncp15xh103"



/* Usage of vendor name "ntc" is deprecated */

<DEPRECATED>	"ntc,ncp15wb473"

Documentation/devicetree/bindings/iio/iio-bindings.txt

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ vdd channel is connected to output 0 of the &ref device. 


	...



	iio_hwmon {

	iio-hwmon {

		compatible = "iio-hwmon";

		io-channels = <&adc 0>, <&adc 1>, <&adc 2>,

			<&adc 3>, <&adc 4>, <&adc 5>,

Documentation/hwmon/adm1275

+23 −6
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ Supported chips: 
    Prefix: 'adm1276'

    Addresses scanned: -

    Datasheet: www.analog.com/static/imported-files/data_sheets/ADM1276.pdf

  * Analog Devices ADM1278

    Prefix: 'adm1278'

    Addresses scanned: -

    Datasheet: www.analog.com/static/imported-files/data_sheets/ADM1278.pdf

  * Analog Devices ADM1293/ADM1294

    Prefix: 'adm1293', 'adm1294'

    Addresses scanned: -
@@ -25,13 +29,15 @@ Author: Guenter Roeck <linux@roeck-us.net> 
Description

-----------



This driver supports hardware montoring for Analog Devices ADM1075, ADM1275,

ADM1276, ADM1293, and ADM1294 Hot-Swap Controller and Digital Power Monitors.

This driver supports hardware monitoring for Analog Devices ADM1075, ADM1275,

ADM1276, ADM1278, ADM1293, and ADM1294 Hot-Swap Controller and Digital

Power Monitors.



ADM1075, ADM1275, ADM1276, ADM1293, and ADM1294 are hot-swap controllers that

allow a circuit board to be removed from or inserted into a live backplane.

They also feature current and voltage readback via an integrated 12

bit analog-to-digital converter (ADC), accessed using a PMBus interface.

ADM1075, ADM1275, ADM1276, ADM1278, ADM1293, and ADM1294 are hot-swap

controllers that allow a circuit board to be removed from or inserted into

a live backplane. They also feature current and voltage readback via an

integrated 12 bit analog-to-digital converter (ADC), accessed using a

PMBus interface.



The driver is a client driver to the core PMBus driver. Please see

Documentation/hwmon/pmbus for details on PMBus client drivers.
@@ -96,3 +102,14 @@ power1_reset_history Write any value to reset history. 


			Power attributes are supported on ADM1075, ADM1276,

			ADM1293, and ADM1294.



temp1_input		Chip temperature.

			Temperature attributes are only available on ADM1278.

temp1_max		Maximum chip temperature.

temp1_max_alarm		Temperature alarm.

temp1_crit		Critical chip temperature.

temp1_crit_alarm	Critical temperature high alarm.

temp1_highest		Highest observed temperature.

temp1_reset_history	Write any value to reset history.



			Temperature attributes are supported on ADM1278.

Documentation/hwmon/lm25066

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ Author: Guenter Roeck <linux@roeck-us.net> 
Description

-----------



This driver supports hardware montoring for National Semiconductor / TI LM25056,

This driver supports hardware monitoring for National Semiconductor / TI LM25056,

LM25063, LM25066, LM5064, and LM5066 Power Management, Monitoring, Control, and

Protection ICs.

CRA Git | Maintained and supported by SUSTech CRA and CCSE