Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40c43269 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-linus-v3.18' of... 

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

Pull hwmon updates from Guenter Roeck:
 - new driver for menf21bmc.
 - convert k10temp, smsc47b397, da9052, da9055 to new hwmon API.
 - register ntc_thermistor driver with thermal subsystem.
 - add support for F15h M60h to k10temp driver.
 - add driver for MEN14F021P00 BMC HWMON driver; this required a merge
   with tag mfd-hwmon-leds-watchdog-v3.18

* tag 'hwmon-for-linus-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (ab8500) Call kernel_power_off instead of pm_power_off
  hwmon: (menf21bmc) Introduce MEN14F021P00 BMC HWMON driver
  leds: leds-menf21bmc: Introduce MEN 14F021P00 BMC LED driver
  watchdog: menf21bmc_wdt: Introduce MEN 14F021P00 BMC Watchdog driver
  mfd: menf21bmc: Introduce MEN 14F021P00 BMC MFD Core driver
  hwmon: (ntc_thermistor) Add ntc thermistor to thermal subsystem as a sensor.
  hwmon: (smsc47b397) Convert to devm_hwmon_device_register_with_groups
  MAINTAINERS: add entry for the PWM fan driver
  hwmon: (k10temp) Convert to devm_hwmon_device_register_with_groups
  hwmon: (k10temp) Add support for F15h M60h
  hwmon: (da9052) Convert to devm_hwmon_device_register_with_groups
  hwmon: (da9055) Convert to devm_hwmon_device_register_with_groups
  hwmon: (ads1015) Use of_property_read_u32 at appropriate places
parents 93834c64 3afb57fa

Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ Requires node properties: 
- "io-channels"	Channel node of ADC to be used for

		conversion.



Optional node properties:

- "#thermal-sensor-cells" Used to expose itself to thermal fw.



Read more about iio bindings at

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

Documentation/hwmon/k10temp

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ Supported chips: 
  Socket S1G2: Athlon (X2), Sempron (X2), Turion X2 (Ultra)

* AMD Family 12h processors: "Llano" (E2/A4/A6/A8-Series)

* AMD Family 14h processors: "Brazos" (C/E/G/Z-Series)

* AMD Family 15h processors: "Bulldozer" (FX-Series), "Trinity", "Kaveri"

* AMD Family 15h processors: "Bulldozer" (FX-Series), "Trinity", "Kaveri", "Carrizo"

* AMD Family 16h processors: "Kabini", "Mullins"



  Prefix: 'k10temp'

Documentation/hwmon/menf21bmc

0 → 100644
+50 −0
Original line number Diff line number Diff line 
Kernel driver menf21bmc_hwmon

=============================



Supported chips:

	* MEN 14F021P00

	  Prefix: 'menf21bmc_hwmon'

	  Adresses scanned: -



Author: Andreas Werner <andreas.werner@men.de>



Description

-----------



The menf21bmc is a Board Management Controller (BMC) which provides an I2C

interface to the host to access the features implemented in the BMC.



This driver gives access to the voltage monitoring feature of the main

voltages of the board.

The voltage sensors are connected to the ADC inputs of the BMC which is

a PIC16F917 Mikrocontroller.



Usage Notes

-----------



This driver is part of the MFD driver named "menf21bmc" and does

not auto-detect devices.

You will have to instantiate the MFD driver explicitly.

Please see Documentation/i2c/instantiating-devices for

details.



Sysfs entries

-------------



The following attributes are supported. All attributes are read only

The Limits are read once by the driver.



in0_input	+3.3V input voltage

in1_input	+5.0V input voltage

in2_input	+12.0V input voltage

in3_input	+5V Standby input voltage

in4_input	VBAT (on board battery)



in[0-4]_min	Minimum voltage limit

in[0-4]_max	Maximum voltage limit



in0_label	"MON_3_3V"

in1_label	"MON_5V"

in2_label	"MON_12V"

in3_label	"5V_STANDBY"

in4_label	"VBAT"

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -7364,6 +7364,14 @@ T: git git://linuxtv.org/media_tree.git 
S:	Maintained

F:	drivers/media/usb/pwc/*



PWM FAN DRIVER

M:	Kamil Debski <k.debski@samsung.com>

L:	lm-sensors@lm-sensors.org

S:	Supported

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

F:	Documentation/hwmon/pwm-fan

F:	drivers/hwmon/pwm-fan.c



PWM SUBSYSTEM

M:	Thierry Reding <thierry.reding@gmail.com>

L:	linux-pwm@vger.kernel.org

drivers/hwmon/Kconfig

+13 −2
Original line number Diff line number Diff line
@@ -280,8 +280,8 @@ config SENSORS_K10TEMP 
	  If you say yes here you get support for the temperature

	  sensor(s) inside your CPU. Supported are later revisions of

	  the AMD Family 10h and all revisions of the AMD Family 11h,

	  12h (Llano), 14h (Brazos), 15h (Bulldozer/Trinity/Kaveri) and

	  16h (Kabini/Mullins) microarchitectures.

	  12h (Llano), 14h (Brazos), 15h (Bulldozer/Trinity/Kaveri/Carrizo)

	  and 16h (Kabini/Mullins) microarchitectures.



	  This driver can also be built as a module.  If so, the module

	  will be called k10temp.
@@ -839,6 +839,16 @@ config SENSORS_MCP3021 
	  This driver can also be built as a module.  If so, the module

	  will be called mcp3021.



config SENSORS_MENF21BMC_HWMON

	tristate "MEN 14F021P00 BMC Hardware Monitoring"

	depends on MFD_MENF21BMC

	help

	  Say Y here to include support for the MEN 14F021P00 BMC

	  hardware monitoring.



	  This driver can also be built as a module. If so the module

	  will be called menf21bmc_hwmon.



config SENSORS_ADCXX

	tristate "National Semiconductor ADCxxxSxxx"

	depends on SPI_MASTER
@@ -1077,6 +1087,7 @@ config SENSORS_PC87427 
config SENSORS_NTC_THERMISTOR

	tristate "NTC thermistor support from Murata"

	depends on !OF || IIO=n || IIO

	depends on THERMAL || !THERMAL_OF

	help

	  This driver supports NTC thermistors sensor reading and its

	  interpretation. The driver can also monitor the temperature and