Linus Torvalds
31f6765266
hwmon changes for v3.4
...
Mostly cleanup. No new drivers this time around, but support for several chips
added to existing drivers: TPS40400, TPS40422, MTD040, MAX34446, ZL9101M,
ZL9117M, and LM96080. Also, added watchdog support for SCH56xx, and additional
attributes for a couple of drivers.
312869e840e19186dda173360a109271126590defe60b873e2163340c5f35c956aad5df15df57918ddefb8a5a7c3683928dd285ad8b313ca07404aaf352df63230f709908ad40e190b78652a260fc86ec7599d32e200c1401d9def130067d7950133aff6e002a52dd636564efb6707b71160631bf0f3a0fbb667094b991d27b9de3ca3ccad47efe87d1743682185696b162c039004ac8bce2778449a7a08958dfb09770b29b0307902fe2fdf445a9a43da3d1228f8e0c8de8368c10369c387e4e86aa3e221d2a8f1bd385d8969e8451683ee1b05d221b9c49120eaf72ca3c7b610775d1d13d623562fca2ec1c319a80b10c4d387df85a0c0d7cc3cb68fda79e5725608a318afd073f1e6cc6370db525ad37f24d548724cc33790fa38430b4fca68abd385ebfd375bdc933c4c4978deeac85d577db780affe3af286107de3df3c22e233c56b064a0d71c86d566e5ed048819f2c0591efffef0967ee61ba0319ed5bc22fff084703af96c531eb32b22de5797384165fe5c7bafda5d0117c3fb3789a093092a696585f16a9e7c4c6b904b6e6a83db56c24af1dc3708c6e8ac099b8c83b2ae8f8c9e14980910b28dcb7cb95996542a6100f6839a9ee08f50904d7c5d47b102ed600151b7fe83ada6bee4a2faaa93
2012-03-21 10:37:25 -07:00
Linus Torvalds
69a7aebcf0
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
...
Pull trivial tree from Jiri Kosina:
"It's indeed trivial -- mostly documentation updates and a bunch of
typo fixes from Masanari.
There are also several linux/version.h include removals from Jesper."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (101 commits)
kcore: fix spelling in read_kcore() comment
constify struct pci_dev * in obvious cases
Revert "char: Fix typo in viotape.c"
init: fix wording error in mm_init comment
usb: gadget: Kconfig: fix typo for 'different'
Revert "power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c"
writeback: fix fn name in writeback_inodes_sb_nr_if_idle() comment header
writeback: fix typo in the writeback_control comment
Documentation: Fix multiple typo in Documentation
tpm_tis: fix tis_lock with respect to RCU
Revert "media: Fix typo in mixer_drv.c and hdmi_drv.c"
Doc: Update numastat.txt
qla4xxx: Add missing spaces to error messages
compiler.h: Fix typo
security: struct security_operations kerneldoc fix
Documentation: broken URL in libata.tmpl
Documentation: broken URL in filesystems.tmpl
mtd: simplify return logic in do_map_probe()
mm: fix comment typo of truncate_inode_pages_range
power: bq27x00: Fix typos in comment
...
2012-03-20 21:12:50 -07:00
Guenter Roeck
3360a106f8
hwmon: (zl6100) Add support for ZL9101M and ZL9117M
...
ZL9101M and ZL9117M are compatible to ZL6100. Add support to the zl6100 driver.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Jean Delvare <khali@linux-fr.org>
2012-03-18 18:27:53 -07:00
Guenter Roeck
fecfb64422
hwmon: (zl6100) Enable interval between chip accesses for all chips
...
Intersil reports that all chips supported by the zl6100 driver require
an interval between chip accesses, even ZL2004 and ZL6105 which were thought
to be safe.
Reported-by: Vivek Gani <vgani@intersil.com>
Cc: stable@vger.kernel.org # 3.2+
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
2012-03-14 09:17:03 -07:00
Masanari Iida
40e47125e6
Documentation: Fix multiple typo in Documentation
...
Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2012-03-07 16:08:24 +01:00
Guenter Roeck
443830f6fd
hwmon: (pmbus/zl6100) Add support for Ericsson BMR45[0,1] and BMR46[2,3,4]
...
Add support for Ericsson BMR450, BMR451, BMR462, BMR463, and BMR464, which are
based on ZL2005 and ZL2008, to zl6100 driver. Remove BMR450 and BMR451 device
IDs from generic PMBus driver.
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Reviewed-by: Robert Coulson <robert.coulson@ericsson.com>
2012-01-05 08:19:28 -08:00
Guenter Roeck
bc581e6fcc
hwmon: (pmbus/zl6100) Add support for ZL2005
...
Add explicit support for ZL2005. Functionality is almost the same as with other
Zilker Labs / Intersil chips, but limit register detection does not work reliably.
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Reviewed-by: Robert Coulson <robert.coulson@ericsson.com>
2012-01-05 08:19:27 -08:00
Guenter Roeck
200855e52d
hwmon: (pmbus) Add support for Intersil power management chips
...
Add support for Intersil / Zilker Labs ZL2004, ZL2006, ZL2008, ZL2105, ZL2106,
ZL6100, and ZL6105.
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Reviewed-by: Robert Coulson <robert.coulson@ericsson.com>
2011-10-24 11:09:40 -07:00
