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

Commit 097d9eb5 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge Linus' latest into master 

Conflicts:

	drivers/watchdog/at91rm9200_wdt.c
	drivers/watchdog/davinci_wdt.c
	drivers/watchdog/ep93xx_wdt.c
	drivers/watchdog/ixp2000_wdt.c
	drivers/watchdog/ixp4xx_wdt.c
	drivers/watchdog/ks8695_wdt.c
	drivers/watchdog/omap_wdt.c
	drivers/watchdog/pnx4008_wdt.c
	drivers/watchdog/sa1100_wdt.c
	drivers/watchdog/wdt285.c
parents c41107c2 aeee90df

Documentation/DocBook/videobook.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -1648,7 +1648,7 @@ static struct video_buffer capture_fb; 


  <chapter id="pubfunctions">

     <title>Public Functions Provided</title>

!Edrivers/media/video/videodev.c

!Edrivers/media/video/v4l2-dev.c

  </chapter>



</book>

Documentation/cciss.txt

+6 −15
Original line number Diff line number Diff line
@@ -112,27 +112,18 @@ Hot plug support for SCSI tape drives 


Hot plugging of SCSI tape drives is supported, with some caveats.

The cciss driver must be informed that changes to the SCSI bus

have been made, in addition to and prior to informing the SCSI 

mid layer.  This may be done via the /proc filesystem.  For example:

have been made.  This may be done via the /proc filesystem.

For example:



	echo "rescan" > /proc/scsi/cciss0/1



This causes the adapter to query the adapter about changes to the 

This causes the driver to query the adapter about changes to the

physical SCSI buses and/or fibre channel arbitrated loop and the

driver to make note of any new or removed sequential access devices

or medium changers.  The driver will output messages indicating what 

devices have been added or removed and the controller, bus, target and 

lun used to address the device.  Once this is done, the SCSI mid layer 

can be informed of changes to the virtual SCSI bus which the driver 

presents to it in the usual way. For example: 



	echo scsi add-single-device 3 2 1 0 > /proc/scsi/scsi

 

to add a device on controller 3, bus 2, target 1, lun 0.   Note that

the driver makes an effort to preserve the devices positions

in the virtual SCSI bus, so if you are only moving tape drives 

around on the same adapter and not adding or removing tape drives 

from the adapter, informing the SCSI mid layer may not be necessary.

lun used to address the device.  It then notifies the SCSI mid layer

of these changes.



Note that the naming convention of the /proc filesystem entries 

contains a number in addition to the driver name.  (E.g. "cciss0"

Documentation/hwmon/dme1737

+37 −16
Original line number Diff line number Diff line
@@ -10,6 +10,10 @@ Supported chips: 
    Prefix: 'sch311x'

    Addresses scanned: none, address read from Super-I/O config space

    Datasheet: http://www.nuhorizons.com/FeaturedProducts/Volume1/SMSC/311x.pdf

  * SMSC SCH5027

    Prefix: 'sch5027'

    Addresses scanned: I2C 0x2c, 0x2d, 0x2e

    Datasheet: Provided by SMSC upon request and under NDA



Authors:

    Juerg Haefliger <juergh@gmail.com>
@@ -27,33 +31,31 @@ Module Parameters 
			following boards:

			- VIA EPIA SN18000



Note that there is no need to use this parameter if the driver loads without

complaining. The driver will say so if it is necessary.





Description

-----------



This driver implements support for the hardware monitoring capabilities of the

SMSC DME1737 and Asus A8000 (which are the same) and SMSC SCH311x Super-I/O

chips. These chips feature monitoring of 3 temp sensors temp[1-3] (2 remote

diodes and 1 internal), 7 voltages in[0-6] (6 external and 1 internal) and up

to 6 fan speeds fan[1-6]. Additionally, the chips implement up to 5 PWM

outputs pwm[1-3,5-6] for controlling fan speeds both manually and

SMSC DME1737 and Asus A8000 (which are the same), SMSC SCH5027, and SMSC

SCH311x Super-I/O chips. These chips feature monitoring of 3 temp sensors

temp[1-3] (2 remote diodes and 1 internal), 7 voltages in[0-6] (6 external and

1 internal) and up to 6 fan speeds fan[1-6]. Additionally, the chips implement

up to 5 PWM outputs pwm[1-3,5-6] for controlling fan speeds both manually and

automatically.



For the DME1737 and A8000, fan[1-2] and pwm[1-2] are always present. Fan[3-6]

and pwm[3,5-6] are optional features and their availability depends on the

configuration of the chip. The driver will detect which features are present

during initialization and create the sysfs attributes accordingly.

For the DME1737, A8000 and SCH5027, fan[1-2] and pwm[1-2] are always present.

Fan[3-6] and pwm[3,5-6] are optional features and their availability depends on

the configuration of the chip. The driver will detect which features are

present during initialization and create the sysfs attributes accordingly.



For the SCH311x, fan[1-3] and pwm[1-3] are always present and fan[4-6] and

pwm[5-6] don't exist.



The hardware monitoring features of the DME1737 and A8000 are only accessible

via SMBus, while the SCH311x only provides access via the ISA bus. The driver

will therefore register itself as an I2C client driver if it detects a DME1737

or A8000 and as a platform driver if it detects a SCH311x chip.

The hardware monitoring features of the DME1737, A8000, and SCH5027 are only

accessible via SMBus, while the SCH311x only provides access via the ISA bus.

The driver will therefore register itself as an I2C client driver if it detects

a DME1737, A8000, or SCH5027 and as a platform driver if it detects a SCH311x

chip.





Voltage Monitoring
@@ -64,6 +66,7 @@ scaling resistors. The values returned by the driver therefore reflect true 
millivolts and don't need scaling. The voltage inputs are mapped as follows

(the last column indicates the input ranges):



DME1737, A8000:

	in0: +5VTR	(+5V standby)		0V - 6.64V

	in1: Vccp	(processor core)	0V - 3V

	in2: VCC	(internal +3.3V)	0V - 4.38V
@@ -72,6 +75,24 @@ millivolts and don't need scaling. The voltage inputs are mapped as follows 
	in5: VTR	(+3.3V standby)		0V - 4.38V

	in6: Vbat	(+3.0V)			0V - 4.38V



SCH311x:

	in0: +2.5V				0V - 6.64V

	in1: Vccp	(processor core)	0V - 2V

	in2: VCC	(internal +3.3V)	0V - 4.38V

	in3: +5V				0V - 6.64V

	in4: +12V				0V - 16V

	in5: VTR	(+3.3V standby)		0V - 4.38V

	in6: Vbat	(+3.0V)			0V - 4.38V



SCH5027:

	in0: +5VTR	(+5V standby)		0V - 6.64V

	in1: Vccp	(processor core)	0V - 3V

	in2: VCC	(internal +3.3V)	0V - 4.38V

	in3: V2_IN				0V - 1.5V

	in4: V1_IN				0V - 1.5V

	in5: VTR	(+3.3V standby)		0V - 4.38V

	in6: Vbat	(+3.0V)			0V - 4.38V



Each voltage input has associated min and max limits which trigger an alarm

when crossed.

Documentation/hwmon/it87

+7 −6
Original line number Diff line number Diff line
@@ -6,12 +6,14 @@ Supported chips: 
    Prefix: 'it87'

    Addresses scanned: from Super I/O config space (8 I/O ports)

    Datasheet: Publicly available at the ITE website

               http://www.ite.com.tw/

               http://www.ite.com.tw/product_info/file/pc/IT8705F_V.0.4.1.pdf

  * IT8712F

    Prefix: 'it8712'

    Addresses scanned: from Super I/O config space (8 I/O ports)

    Datasheet: Publicly available at the ITE website

               http://www.ite.com.tw/

               http://www.ite.com.tw/product_info/file/pc/IT8712F_V0.9.1.pdf

               http://www.ite.com.tw/product_info/file/pc/Errata%20V0.1%20for%20IT8712F%20V0.9.1.pdf

               http://www.ite.com.tw/product_info/file/pc/IT8712F_V0.9.3.pdf

  * IT8716F/IT8726F

    Prefix: 'it8716'

    Addresses scanned: from Super I/O config space (8 I/O ports)
@@ -90,14 +92,13 @@ upper VID bits share their pins with voltage inputs (in5 and in6) so you 
can't have both on a given board.



The IT8716F, IT8718F and later IT8712F revisions have support for

2 additional fans. They are supported by the driver for the IT8716F and

IT8718F but not for the IT8712F

2 additional fans. The additional fans are supported by the driver.



The IT8716F and IT8718F, and late IT8712F and IT8705F also have optional

16-bit tachometer counters for fans 1 to 3. This is better (no more fan

clock divider mess) but not compatible with the older chips and

revisions. For now, the driver only uses the 16-bit mode on the

IT8716F and IT8718F.

revisions. The 16-bit tachometer mode is enabled by the driver when one

of the above chips is detected.



The IT8726F is just bit enhanced IT8716F with additional hardware

for AMD power sequencing. Therefore the chip will appear as IT8716F

Documentation/hwmon/w83627hf

+0 −4
Original line number Diff line number Diff line
@@ -40,10 +40,6 @@ Module Parameters 
  (default is 1)

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

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

* reset: int

  (default is 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.



Description

-----------