Commit ab387f0a authored by Herbert Xu's avatar Herbert Xu
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux 

Merge 4.14-rc3 in order to pick up the new timer_setup function.
parents e666d4e9 9e66317d

Documentation/cpu-freq/index.txt

+0 −2
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ cpufreq-stats.txt - General description of sysfs cpufreq stats. 


index.txt	-	File index, Mailing list and Links (this document)



intel-pstate.txt -	Intel pstate cpufreq driver specific file.



pcc-cpufreq.txt -	PCC cpufreq driver specific file.

Documentation/devicetree/bindings/clock/st,stm32h7-rcc.txt

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ Example: 
		compatible = "st,stm32h743-rcc", "st,stm32-rcc";

		reg = <0x58024400 0x400>;

		#reset-cells = <1>;

		#clock-cells = <2>;

		#clock-cells = <1>;

		clocks = <&clk_hse>, <&clk_lse>, <&clk_i2s_ckin>;



		st,syscfg = <&pwrcfg>;

Documentation/devicetree/bindings/leds/ams,as3645a.txt

+18 −10
Original line number Diff line number Diff line
@@ -15,11 +15,14 @@ Required properties 


compatible	: Must be "ams,as3645a".

reg		: The I2C address of the device. Typically 0x30.

#address-cells	: 1

#size-cells	: 0





Required properties of the "flash" child node

=============================================

Required properties of the flash child node (0)

===============================================



reg: 0

flash-timeout-us: Flash timeout in microseconds. The value must be in

		  the range [100000, 850000] and divisible by 50000.

flash-max-microamp: Maximum flash current in microamperes. Has to be
@@ -33,20 +36,21 @@ ams,input-max-microamp: Maximum flash controller input current. The 
			and divisible by 50000.





Optional properties of the "flash" child node

=============================================

Optional properties of the flash child node

===========================================



label		: The label of the flash LED.





Required properties of the "indicator" child node

=================================================

Required properties of the indicator child node (1)

===================================================



reg: 1

led-max-microamp: Maximum indicator current. The allowed values are

		  2500, 5000, 7500 and 10000.



Optional properties of the "indicator" child node

=================================================

Optional properties of the indicator child node

===============================================



label		: The label of the indicator LED.
@@ -55,16 +59,20 @@ Example 
=======



	as3645a@30 {

		#address-cells: 1

		#size-cells: 0

		reg = <0x30>;

		compatible = "ams,as3645a";

		flash {

		flash@0 {

			reg = <0x0>;

			flash-timeout-us = <150000>;

			flash-max-microamp = <320000>;

			led-max-microamp = <60000>;

			ams,input-max-microamp = <1750000>;

			label = "as3645a:flash";

		};

		indicator {

		indicator@1 {

			reg = <0x1>;

			led-max-microamp = <10000>;

			label = "as3645a:indicator";

		};

Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt

+6 −0
Original line number Diff line number Diff line
@@ -8,6 +8,12 @@ Required properties: 
                   the firmware event log

- linux,sml-size : size of the memory allocated for the firmware event log



Optional properties:



- powered-while-suspended: present when the TPM is left powered on between

                           suspend and resume (makes the suspend/resume

                           callbacks do nothing).



Example (for OpenPower Systems with Nuvoton TPM 2.0 on I2C)

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

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −1
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ Device tree binding vendor prefix registry. Keep list in alphabetical order. 
This isn't an exhaustive list, but you should add new prefixes to it before

using them to avoid name-space collisions.



abcn	Abracon Corporation

abilis	Abilis Systems

abracon	Abracon Corporation

actions	Actions Semiconductor Co., Ltd.

active-semi	Active-Semi International Inc

ad	Avionic Design GmbH