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

Commit 66b01996 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull hwmon updates from Guenter Roeck:
 "New driver for MAX31790, added support for TMP75C, as well as cleanups
  and minor improvements in various drivers"

* tag 'hwmon-for-linus-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (fam15h_power) Add max compute unit accumulated power
  hwmon: (fam15h_power) Enable power1_input on AMD Carrizo
  hwmon: (fam15h_power) Refactor attributes for dynamically added
  hwmon: (ina2xx) remove no longer used variable 'kind'
  hwmon: (nct6775) Introduce separate temperature labels for NCT6792 and NCT6793
  hwmon: (nct6775) NCT6791D and NCT6792D have an additional temperature source
  hwmon: (ina2xx) give precedence to DT over checking for platform data.
  hwmon: (ina2xx) convert driver to using regmap
  hwmon: (coretemp) Increase limit of maximum core ID from 32 to 128.
  hwmon: (lm75) Add support for TMP75C
  hwmon: (ibmpowernv) Add OF compatibility table entry
  hwmon: (abx500) drop the use of IRQF_NO_SUSPEND
  hwmon: (max31790) Fix dereference of ERR_PTR
  hwmon: Driver for Maxim MAX31790
parents a5ad88ce 3b5ea47d

Documentation/hwmon/lm75

+3 −2
Original line number Original line Diff line number Diff line
@@ -42,8 +42,8 @@ Supported chips: 
    Addresses scanned: none

    Addresses scanned: none

    Datasheet: Publicly available at the ST website

    Datasheet: Publicly available at the ST website

               http://www.st.com/internet/analog/product/121769.jsp

               http://www.st.com/internet/analog/product/121769.jsp

  * Texas Instruments TMP100, TMP101, TMP105, TMP112, TMP75, TMP175, TMP275

  * Texas Instruments TMP100, TMP101, TMP105, TMP112, TMP75, TMP75C, TMP175, TMP275

    Prefixes: 'tmp100', 'tmp101', 'tmp105', 'tmp112', 'tmp175', 'tmp75', 'tmp275'

    Prefixes: 'tmp100', 'tmp101', 'tmp105', 'tmp112', 'tmp175', 'tmp75', 'tmp75c', 'tmp275'

    Addresses scanned: none

    Addresses scanned: none

    Datasheet: Publicly available at the Texas Instruments website

    Datasheet: Publicly available at the Texas Instruments website

               http://www.ti.com/product/tmp100

               http://www.ti.com/product/tmp100
@@ -51,6 +51,7 @@ Supported chips: 
               http://www.ti.com/product/tmp105

               http://www.ti.com/product/tmp105

               http://www.ti.com/product/tmp112

               http://www.ti.com/product/tmp112

               http://www.ti.com/product/tmp75

               http://www.ti.com/product/tmp75

               http://www.ti.com/product/tmp75c

               http://www.ti.com/product/tmp175

               http://www.ti.com/product/tmp175

               http://www.ti.com/product/tmp275

               http://www.ti.com/product/tmp275

  * NXP LM75B

  * NXP LM75B

Documentation/hwmon/max31790

0 → 100644
+37 −0
Original line number Original line Diff line number Diff line 
Kernel driver max31790

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



Supported chips:

  * Maxim MAX31790

    Prefix: 'max31790'

    Addresses scanned: -

    Datasheet: http://pdfserv.maximintegrated.com/en/ds/MAX31790.pdf



Author: Il Han <corone.il.han@gmail.com>





Description

-----------



This driver implements support for the Maxim MAX31790 chip.



The MAX31790 controls the speeds of up to six fans using six independent

PWM outputs. The desired fan speeds (or PWM duty cycles) are written

through the I2C interface. The outputs drive "4-wire" fans directly,

or can be used to modulate the fan's power terminals using an external

pass transistor.



Tachometer inputs monitor fan tachometer logic outputs for precise (+/-1%)

monitoring and control of fan RPM as well as detection of fan failure.

Six pins are dedicated tachometer inputs. Any of the six PWM outputs can

also be configured to serve as tachometer inputs.





Sysfs entries

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



fan[1-12]_input    RO  fan tachometer speed in RPM

fan[1-12]_fault    RO  fan experienced fault

fan[1-6]_target    RW  desired fan speed in RPM

pwm[1-6]_enable    RW  regulator mode, 0=disabled, 1=manual mode, 2=rpm mode

pwm[1-6]           RW  fan target duty cycle (0-255)

drivers/hwmon/Kconfig

+10 −0
Original line number Original line Diff line number Diff line
@@ -840,6 +840,16 @@ config SENSORS_MAX6697 
	  This driver can also be built as a module.  If so, the module

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

	  will be called max6697.

	  will be called max6697.





config SENSORS_MAX31790

	tristate "Maxim MAX31790 sensor chip"

	depends on I2C

	help

	  If you say yes here you get support for 6-Channel PWM-Output

	  Fan RPM Controller.



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

	  will be called max31790.



config SENSORS_HTU21

config SENSORS_HTU21

	tristate "Measurement Specialties HTU21D humidity/temperature sensors"

	tristate "Measurement Specialties HTU21D humidity/temperature sensors"

	depends on I2C

	depends on I2C

drivers/hwmon/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -115,6 +115,7 @@ obj-$(CONFIG_SENSORS_MAX6639) += max6639.o 
obj-$(CONFIG_SENSORS_MAX6642)	+= max6642.o

obj-$(CONFIG_SENSORS_MAX6642)	+= max6642.o

obj-$(CONFIG_SENSORS_MAX6650)	+= max6650.o

obj-$(CONFIG_SENSORS_MAX6650)	+= max6650.o

obj-$(CONFIG_SENSORS_MAX6697)	+= max6697.o

obj-$(CONFIG_SENSORS_MAX6697)	+= max6697.o

obj-$(CONFIG_SENSORS_MAX31790)	+= max31790.o

obj-$(CONFIG_SENSORS_MC13783_ADC)+= mc13783-adc.o

obj-$(CONFIG_SENSORS_MC13783_ADC)+= mc13783-adc.o

obj-$(CONFIG_SENSORS_MCP3021)	+= mcp3021.o

obj-$(CONFIG_SENSORS_MCP3021)	+= mcp3021.o

obj-$(CONFIG_SENSORS_MENF21BMC_HWMON) += menf21bmc_hwmon.o

obj-$(CONFIG_SENSORS_MENF21BMC_HWMON) += menf21bmc_hwmon.o

drivers/hwmon/abx500.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -377,7 +377,7 @@ static int setup_irqs(struct platform_device *pdev) 
	}

	}





	ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,

	ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,

		abx500_temp_irq_handler, IRQF_NO_SUSPEND, "abx500-temp", pdev);

		abx500_temp_irq_handler, 0, "abx500-temp", pdev);

	if (ret < 0)

	if (ret < 0)

		dev_err(&pdev->dev, "Request threaded irq failed (%d)\n", ret);

		dev_err(&pdev->dev, "Request threaded irq failed (%d)\n", ret);