diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-10 19:49:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-10 19:49:18 -0400 |
| commit | e626d177fcb7d8eb759da49c652a68ff90a59fba (patch) | |
| tree | 6223d17d7601212c51d223657d273d6e7bc0807a /Documentation | |
| parent | df632d3ce7eacf92ad9b642301c7b53a1d95b8d8 (diff) | |
| parent | 0657777fcefffbf79d4a5fa0952a3f1a4248c0da (diff) | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/hwmon/da9052 | 2 | ||||
| -rw-r--r-- | Documentation/hwmon/max1619 | 2 | ||||
| -rw-r--r-- | Documentation/hwmon/twl4030-madc-hwmon | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/hwmon/da9052 b/Documentation/hwmon/da9052 index ef898553638..5bc51346b68 100644 --- a/Documentation/hwmon/da9052 +++ b/Documentation/hwmon/da9052 | |||
| @@ -56,6 +56,6 @@ The junction temperature is calculated: | |||
| 56 | The junction temperature attribute is supported by the driver. | 56 | The junction temperature attribute is supported by the driver. |
| 57 | 57 | ||
| 58 | The battery temperature is calculated: | 58 | The battery temperature is calculated: |
| 59 | Degree Celcius = 1 / (t1 + 1/298)- 273 | 59 | Degree Celsius = 1 / (t1 + 1/298)- 273 |
| 60 | where t1 = (1/B)* ln(( ADCval * 2.5)/(R25*ITBAT*255)) | 60 | where t1 = (1/B)* ln(( ADCval * 2.5)/(R25*ITBAT*255)) |
| 61 | Default values of R25, B, ITBAT are 10e3, 3380 and 50e-6 respectively. | 61 | Default values of R25, B, ITBAT are 10e3, 3380 and 50e-6 respectively. |
diff --git a/Documentation/hwmon/max1619 b/Documentation/hwmon/max1619 index d6f8d9cd7d7..e6d87398cc8 100644 --- a/Documentation/hwmon/max1619 +++ b/Documentation/hwmon/max1619 | |||
| @@ -9,7 +9,7 @@ Supported chips: | |||
| 9 | http://pdfserv.maxim-ic.com/en/ds/MAX1619.pdf | 9 | http://pdfserv.maxim-ic.com/en/ds/MAX1619.pdf |
| 10 | 10 | ||
| 11 | Authors: | 11 | Authors: |
| 12 | Alexey Fisher <fishor@mail.ru>, | 12 | Oleksij Rempel <bug-track@fisher-privat.net>, |
| 13 | Jean Delvare <khali@linux-fr.org> | 13 | Jean Delvare <khali@linux-fr.org> |
| 14 | 14 | ||
| 15 | Description | 15 | Description |
diff --git a/Documentation/hwmon/twl4030-madc-hwmon b/Documentation/hwmon/twl4030-madc-hwmon index ef7984317ce..c3a3a5be10a 100644 --- a/Documentation/hwmon/twl4030-madc-hwmon +++ b/Documentation/hwmon/twl4030-madc-hwmon | |||
| @@ -41,5 +41,5 @@ Channel Signal | |||
| 41 | 41 | ||
| 42 | The Sysfs nodes will represent the voltage in the units of mV, | 42 | The Sysfs nodes will represent the voltage in the units of mV, |
| 43 | the temperature channel shows the converted temperature in | 43 | the temperature channel shows the converted temperature in |
| 44 | degree celcius. The Battery charging current channel represents | 44 | degree Celsius. The Battery charging current channel represents |
| 45 | battery charging current in mA. | 45 | battery charging current in mA. |