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

Commit ebec44a2 authored by Dave Airlie's avatar Dave Airlie
Browse files

BackMerge tag 'v4.14-rc3' into drm-next 

Linux 4.14-rc3

Requested by Daniel for the tracing build fix in fixes.
parents 659333de 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/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";

		};

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -8603,6 +8603,12 @@ M: Sean Wang <sean.wang@mediatek.com> 
S:	Maintained

F:	drivers/media/rc/mtk-cir.c



MEDIATEK PMIC LED DRIVER

M:	Sean Wang <sean.wang@mediatek.com>

S:	Maintained

F:	drivers/leds/leds-mt6323.c

F:	Documentation/devicetree/bindings/leds/leds-mt6323.txt



MEDIATEK ETHERNET DRIVER

M:	Felix Fietkau <nbd@openwrt.org>

M:	John Crispin <john@phrozen.org>

Makefile

+3 −3
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 0

EXTRAVERSION = -rc2

EXTRAVERSION = -rc3

NAME = Fearless Coyote



# *DOCUMENTATION*
@@ -1172,11 +1172,11 @@ headers_check: headers_install 


PHONY += kselftest

kselftest:

	$(Q)$(MAKE) -C tools/testing/selftests run_tests

	$(Q)$(MAKE) -C $(srctree)/tools/testing/selftests run_tests



PHONY += kselftest-clean

kselftest-clean:

	$(Q)$(MAKE) -C tools/testing/selftests clean

	$(Q)$(MAKE) -C $(srctree)/tools/testing/selftests clean



PHONY += kselftest-merge

kselftest-merge:

arch/arm/boot/dts/omap3-n950-n9.dtsi

+7 −3
Original line number Diff line number Diff line
@@ -267,15 +267,19 @@ 
	clock-frequency = <400000>;



	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>;

			peak-current-limit = <1750000>;

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

		};

		indicator {

		indicator@1 {

			reg = <0x1>;

			led-max-microamp = <10000>;

		};

	};