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

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

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6: (36 commits)
  [PATCH] hwmon: add required idr locking
  [PATCH] I2C: hwmon: Rename register parameters
  [PATCH] I2C: Drop unneeded i2c-dev.h includes
  [PATCH] I2C: i2c-ixp4xx: Add hwmon class
  [PATCH] I2C: i2c-piix4: Add Broadcom HT-1000 support
  [PATCH] I2C: i2c-amd756-s4882: Improve static mutex initialization
  [PATCH] I2C: i2c-ali1535: Drop redundant mutex
  [PATCH] i2c: Cleanup isp1301_omap
  [PATCH] i2c: Fix i2c-ite name initialization
  [PATCH] i2c: Drop the i2c-frodo bus driver
  [PATCH] i2c: Optimize core_lists mutex usage
  [PATCH] w83781d: Don't reset the chip by default
  [PATCH] w83781d: Document the alarm and beep bits
  [PATCH] w83627ehf: Refactor the sysfs interface
  [PATCH] hwmon: Support the Pentium M VID code
  [PATCH] hwmon: Add support for the Winbond W83687THF
  [PATCH] hwmon: f71805f semaphore to mutex conversions
  [PATCH] hwmon: Semaphore to mutex conversions
  [PATCH] i2c: Semaphore to mutex conversions, part 3
  [PATCH] i2c: Semaphore to mutex conversions, part 2
  ...
parents a3ea9b58 ded2b666

Documentation/hwmon/w83627hf

+4 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,10 @@ Supported chips: 
    Prefix: 'w83637hf'

    Prefix: 'w83637hf'

    Addresses scanned: ISA address retrieved from Super I/O registers

    Addresses scanned: ISA address retrieved from Super I/O registers

    Datasheet: http://www.winbond.com/PDF/sheet/w83637hf.pdf

    Datasheet: http://www.winbond.com/PDF/sheet/w83637hf.pdf

  * Winbond W83687THF

    Prefix: 'w83687thf'

    Addresses scanned: ISA address retrieved from Super I/O registers

    Datasheet: Provided by Winbond on request





Authors:

Authors:

        Frodo Looijaard <frodol@dds.nl>,

        Frodo Looijaard <frodol@dds.nl>,

Documentation/hwmon/w83781d

+24 −0
Original line number Original line Diff line number Diff line
@@ -36,6 +36,11 @@ Module parameters 
  Use 'init=0' to bypass initializing the chip.

  Use 'init=0' to bypass initializing the chip.

  Try this if your computer crashes when you load the module.

  Try this if your computer crashes when you load the module.





* reset int

  (default 0)

  The driver used to reset the chip on load, but does no more. Use

  'reset=1' to restore the old behavior. Report if you need to do this.



force_subclients=bus,caddr,saddr,saddr

force_subclients=bus,caddr,saddr,saddr

  This is used to force the i2c addresses for subclients of

  This is used to force the i2c addresses for subclients of

  a certain chip. Typical usage is `force_subclients=0,0x2d,0x4a,0x4b'

  a certain chip. Typical usage is `force_subclients=0,0x2d,0x4a,0x4b'
@@ -123,6 +128,25 @@ When an alarm goes off, you can be warned by a beeping signal through 
your computer speaker. It is possible to enable all beeping globally,

your computer speaker. It is possible to enable all beeping globally,

or only the beeping for some alarms.

or only the beeping for some alarms.





Individual alarm and beep bits:



0x000001: in0

0x000002: in1

0x000004: in2

0x000008: in3

0x000010: temp1

0x000020: temp2 (+temp3 on W83781D)

0x000040: fan1

0x000080: fan2

0x000100: in4

0x000200: in5

0x000400: in6

0x000800: fan3

0x001000: chassis

0x002000: temp3 (W83782D and W83627HF only)

0x010000: in7 (W83782D and W83627HF only)

0x020000: in8 (W83782D and W83627HF only)



If an alarm triggers, it will remain triggered until the hardware register

If an alarm triggers, it will remain triggered until the hardware register

is read at least once. This means that the cause for the alarm may

is read at least once. This means that the cause for the alarm may

already have disappeared! Note that in the current implementation, all

already have disappeared! Note that in the current implementation, all

Documentation/i2c/busses/i2c-piix4

+1 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ Supported adapters: 
  * Intel 82371AB PIIX4 and PIIX4E

  * Intel 82371AB PIIX4 and PIIX4E

  * Intel 82443MX (440MX)

  * Intel 82443MX (440MX)

    Datasheet: Publicly available at the Intel website

    Datasheet: Publicly available at the Intel website

  * ServerWorks OSB4, CSB5 and CSB6 southbridges

  * ServerWorks OSB4, CSB5, CSB6 and HT-1000 southbridges

    Datasheet: Only available via NDA from ServerWorks

    Datasheet: Only available via NDA from ServerWorks

  * Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge

  * Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge

    Datasheet: Publicly available at the SMSC website http://www.smsc.com

    Datasheet: Publicly available at the SMSC website http://www.smsc.com

Documentation/i2c/busses/scx200_acb

+3 −2
Original line number Original line Diff line number Diff line
@@ -6,9 +6,10 @@ Module Parameters 
-----------------

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





* base: int

* base: int

  Base addresses for the ACCESS.bus controllers

  Base addresses for the ACCESS.bus controllers on SCx200 and SC1100 devices





Description

Description

-----------

-----------





Enable the use of the ACCESS.bus controllers of a SCx200 processor.
 
Enable the use of the ACCESS.bus controller on the Geode SCx200 and

SC1100 processors and the CS5535 and CS5536 Geode companion devices.

drivers/hwmon/Kconfig

+4 −3
Original line number Original line Diff line number Diff line
@@ -406,13 +406,14 @@ config SENSORS_W83L785TS 
	  will be called w83l785ts.

	  will be called w83l785ts.





config SENSORS_W83627HF

config SENSORS_W83627HF

	tristate "Winbond W83627HF, W83627THF, W83637HF, W83697HF"

	tristate "Winbond W83627HF, W83627THF, W83637HF, W83687THF, W83697HF"

	depends on HWMON && I2C && EXPERIMENTAL

	depends on HWMON && I2C

	select I2C_ISA

	select I2C_ISA

	select HWMON_VID

	select HWMON_VID

	help

	help

	  If you say yes here you get support for the Winbond W836X7 series

	  If you say yes here you get support for the Winbond W836X7 series

	  of sensor chips: the W83627HF, W83627THF, W83637HF, and the W83697HF

	  of sensor chips: the W83627HF, W83627THF, W83637HF, W83687THF and

	  W83697HF.





	  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 w83627hf.

	  will be called w83627hf.