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

Commit 44e8ba93 authored by Florian Tobias Schandinat's avatar Florian Tobias Schandinat
Browse files

Merge commit 'v3.3' into fbdev-next

parents e9fe8a71 c16fa4f2

Documentation/devicetree/bindings/gpio/led.txt

+3 −3
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ Each LED is represented as a sub-node of the gpio-leds device. Each 
node's name represents the name of the corresponding LED.



LED sub-node properties:

- gpios :  Should specify the LED's GPIO, see "Specifying GPIO information

  for devices" in Documentation/devicetree/booting-without-of.txt.  Active

  low LEDs should be indicated using flags in the GPIO specifier.

- gpios :  Should specify the LED's GPIO, see "gpios property" in

  Documentation/devicetree/gpio.txt.  Active low LEDs should be

  indicated using flags in the GPIO specifier.

- label :  (optional) The label for this LED.  If omitted, the label is

  taken from the node name (excluding the unit address).

- linux,default-trigger :  (optional) This parameter, if present, is a

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ national National Semiconductor 
nintendo	Nintendo

nvidia	NVIDIA

nxp	NXP Semiconductors

picochip	Picochip Ltd

powervr	Imagination Technologies

qcom	Qualcomm, Inc.

ramtron	Ramtron International

Documentation/hwmon/jc42

+20 −6
Original line number Diff line number Diff line
@@ -7,21 +7,29 @@ Supported chips: 
    Addresses scanned: I2C 0x18 - 0x1f

    Datasheets:

	http://www.analog.com/static/imported-files/data_sheets/ADT7408.pdf

  * IDT TSE2002B3, TS3000B3

    Prefix: 'tse2002b3', 'ts3000b3'

  * Atmel AT30TS00

    Prefix: 'at30ts00'

    Addresses scanned: I2C 0x18 - 0x1f

    Datasheets:

	http://www.idt.com/products/getdoc.cfm?docid=18715691

	http://www.idt.com/products/getdoc.cfm?docid=18715692

	http://www.atmel.com/Images/doc8585.pdf

  * IDT TSE2002B3, TSE2002GB2, TS3000B3, TS3000GB2

    Prefix: 'tse2002', 'ts3000'

    Addresses scanned: I2C 0x18 - 0x1f

    Datasheets:

	http://www.idt.com/sites/default/files/documents/IDT_TSE2002B3C_DST_20100512_120303152056.pdf

	http://www.idt.com/sites/default/files/documents/IDT_TSE2002GB2A1_DST_20111107_120303145914.pdf

	http://www.idt.com/sites/default/files/documents/IDT_TS3000B3A_DST_20101129_120303152013.pdf

	http://www.idt.com/sites/default/files/documents/IDT_TS3000GB2A1_DST_20111104_120303151012.pdf

  * Maxim MAX6604

    Prefix: 'max6604'

    Addresses scanned: I2C 0x18 - 0x1f

    Datasheets:

	http://datasheets.maxim-ic.com/en/ds/MAX6604.pdf

  * Microchip MCP9805, MCP98242, MCP98243, MCP9843

    Prefixes: 'mcp9805', 'mcp98242', 'mcp98243', 'mcp9843'

  * Microchip MCP9804, MCP9805, MCP98242, MCP98243, MCP9843

    Prefixes: 'mcp9804', 'mcp9805', 'mcp98242', 'mcp98243', 'mcp9843'

    Addresses scanned: I2C 0x18 - 0x1f

    Datasheets:

	http://ww1.microchip.com/downloads/en/DeviceDoc/22203C.pdf

	http://ww1.microchip.com/downloads/en/DeviceDoc/21977b.pdf

	http://ww1.microchip.com/downloads/en/DeviceDoc/21996a.pdf

	http://ww1.microchip.com/downloads/en/DeviceDoc/22153c.pdf
@@ -48,6 +56,12 @@ Supported chips: 
    Datasheets:

	http://www.st.com/stonline/products/literature/ds/13447/stts424.pdf

	http://www.st.com/stonline/products/literature/ds/13448/stts424e02.pdf

  * ST Microelectronics STTS2002, STTS3000

    Prefix: 'stts2002', 'stts3000'

    Addresses scanned: I2C 0x18 - 0x1f

    Datasheets:

	http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00225278.pdf

	http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATA_BRIEF/CD00270920.pdf

  * JEDEC JC 42.4 compliant temperature sensor chips

    Prefix: 'jc42'

    Addresses scanned: I2C 0x18 - 0x1f

Documentation/hwmon/w83627ehf

+7 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ W83627DHG, W83627DHG-P, W83627UHG, W83667HG, W83667HG-B, W83667HG-I 
(NCT6775F), and NCT6776F super I/O chips. We will refer to them collectively

as Winbond chips.



The chips implement 2 to 4 temperature sensors (9 for NCT6775F and NCT6776F),

The chips implement 3 to 4 temperature sensors (9 for NCT6775F and NCT6776F),

2 to 5 fan rotation speed sensors, 8 to 10 analog voltage sensors, one VID

(except for 627UHG), alarms with beep warnings (control unimplemented),

and some automatic fan regulation strategies (plus manual fan control mode).
@@ -143,8 +143,13 @@ pwm[1-4]_min_output - minimum fan speed (range 1 - 255), when the temperature 
pwm[1-4]_stop_time  - how many milliseconds [ms] must elapse to switch

                      corresponding fan off. (when the temperature was below

                      defined range).

pwm[1-4]_start_output-minimum fan speed (range 1 - 255) when spinning up

pwm[1-4]_step_output- rate of fan speed change (1 - 255)

pwm[1-4]_stop_output- minimum fan speed (range 1 - 255) when spinning down

pwm[1-4]_max_output - maximum fan speed (range 1 - 255), when the temperature

                      is above defined range.



Note: last two functions are influenced by other control bits, not yet exported

Note: last six functions are influenced by other control bits, not yet exported

      by the driver, so a change might not have any effect.



Implementation Details

Documentation/hwmon/zl6100

+6 −8
Original line number Diff line number Diff line
@@ -88,14 +88,12 @@ Module parameters 
delay

-----



Some Intersil/Zilker Labs DC-DC controllers require a minimum interval between

I2C bus accesses. According to Intersil, the minimum interval is 2 ms, though

1 ms appears to be sufficient and has not caused any problems in testing.

The problem is known to affect ZL6100, ZL2105, and ZL2008. It is known not to

affect ZL2004 and ZL6105. The driver automatically sets the interval to 1 ms

except for ZL2004 and ZL6105. To enable manual override, the driver provides a

writeable module parameter, 'delay', which can be used to set the interval to

a value between 0 and 65,535 microseconds.

Intersil/Zilker Labs DC-DC controllers require a minimum interval between I2C

bus accesses. According to Intersil, the minimum interval is 2 ms, though 1 ms

appears to be sufficient and has not caused any problems in testing. The problem

is known to affect all currently supported chips. For manual override, the

driver provides a writeable module parameter, 'delay', which can be used to set

the interval to a value between 0 and 65,535 microseconds.





Sysfs entries