diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-17 10:15:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-17 10:15:57 -0700 |
| commit | d7d45fedf92b351500af99d03004e59531a3d070 (patch) | |
| tree | 3d6a89e8b66770747c9df65186ec345a8babcebe /Documentation | |
| parent | 9134e7d2706a8954f216a9f11ef784e0f9ccd551 (diff) | |
| parent | f3261dfb5538e2ff0264fde3050dbd4e922fa296 (diff) | |
| download | op-kernel-dev-d7d45fedf92b351500af99d03004e59531a3d070.zip op-kernel-dev-d7d45fedf92b351500af99d03004e59531a3d070.tar.gz | |
Merge tag 'char-misc-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull Char / Misc driver fixes from Greg Kroah-Hartman:
"Here are some small misc and w1 driver fixes for 3.6-rc3. Nothing
major, just some some bugfixes and a new device id for a w1 driver.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
* tag 'char-misc-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
1-Wire: Add support for the maxim ds1825 temperature sensor
ti-st: Fix check for pdata->chip_awake function pointer
mei: add mei_quirk_probe function
mei: fix device stall after wd is stopped
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/w1/slaves/w1_therm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/w1/slaves/w1_therm b/Documentation/w1/slaves/w1_therm index 0403aaa..874a8ca 100644 --- a/Documentation/w1/slaves/w1_therm +++ b/Documentation/w1/slaves/w1_therm @@ -3,6 +3,7 @@ Kernel driver w1_therm Supported chips: * Maxim ds18*20 based temperature sensors. + * Maxim ds1825 based temperature sensors. Author: Evgeniy Polyakov <johnpol@2ka.mipt.ru> @@ -15,6 +16,7 @@ supported family codes: W1_THERM_DS18S20 0x10 W1_THERM_DS1822 0x22 W1_THERM_DS18B20 0x28 +W1_THERM_DS1825 0x3B Support is provided through the sysfs w1_slave file. Each open and read sequence will initiate a temperature conversion then provide two |
