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

Commit b2f1df8d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'renesas/timer' into next/timer 



Conflicts:
	arch/arm/mach-shmobile/timer.c

This resolves a nonobvious merge conflict between renesas
timer changes in the global timer changes with those
from the renesas soc branch and last minute bug fixes that
went into v3.3.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c0206e22 5cd9eb27

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/input/alps.txt

+2 −1
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ Detection 


All ALPS touchpads should respond to the "E6 report" command sequence:

E8-E6-E6-E6-E9. An ALPS touchpad should respond with either 00-00-0A or

00-00-64.

00-00-64 if no buttons are pressed. The bits 0-2 of the first byte will be 1s

if some buttons are pressed.



If the E6 report is successful, the touchpad model is identified using the "E7

report" sequence: E8-E7-E7-E7-E9. The response is the model signature and is

Documentation/kernel-parameters.txt

+6 −0
Original line number Diff line number Diff line
@@ -2211,6 +2211,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 


			default: off.



	printk.always_kmsg_dump=

			Trigger kmsg_dump for cases other than kernel oops or

			panics

			Format: <bool>  (1/Y/y=enable, 0/N/n=disable)

			default: disabled



	printk.time=	Show timing data prefixed to each printk message line

			Format: <bool>  (1/Y/y=enable, 0/N/n=disable)