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

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

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging 

Pull hwmon updates from Jean Delvare:
 "Only trivial things this time"

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: Drop needless includes of <linux/delay.h>
  hwmon: Add missing inclusions of <linux/err.h>
  hwmon: Add missing inclusions of <linux/jiffies.h>
  hwmon: Fix spelling of Celsius
  hwmon: Update Alexey Fisher's name
parents df632d3c 0657777f

Documentation/hwmon/da9052

+1 −1
Original line number Diff line number Diff line
@@ -56,6 +56,6 @@ The junction temperature is calculated: 
The junction temperature attribute is supported by the driver.



The battery temperature is calculated:

	Degree Celcius = 1 / (t1 + 1/298)- 273

	Degree Celsius = 1 / (t1 + 1/298)- 273

where t1 = (1/B)* ln(( ADCval * 2.5)/(R25*ITBAT*255))

Default values of R25, B, ITBAT are 10e3, 3380 and 50e-6 respectively.

Documentation/hwmon/max1619

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ Supported chips: 
               http://pdfserv.maxim-ic.com/en/ds/MAX1619.pdf



Authors:

        Alexey Fisher <fishor@mail.ru>,

        Oleksij Rempel <bug-track@fisher-privat.net>,

        Jean Delvare <khali@linux-fr.org>



Description

Documentation/hwmon/twl4030-madc-hwmon

+1 −1
Original line number Diff line number Diff line
@@ -41,5 +41,5 @@ Channel Signal 


The Sysfs nodes will represent the voltage in the units of mV,

the temperature channel shows the converted temperature in

degree celcius. The Battery charging current channel represents

degree Celsius. The Battery charging current channel represents

battery charging current in mA.

drivers/hwmon/acpi_power_meter.c

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/kdev_t.h>

#include <linux/sched.h>

#include <linux/time.h>

#include <linux/err.h>

#include <acpi/acpi_drivers.h>

#include <acpi/acpi_bus.h>

drivers/hwmon/adm9240.c

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include <linux/hwmon-vid.h>

#include <linux/err.h>

#include <linux/mutex.h>

#include <linux/jiffies.h>



/* Addresses to scan */

static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f,