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

Commit 722c908f authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'irqchip-4.15-2' of... 

Merge tag 'irqchip-4.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core

Pull the second batch of irqchip updates for 4.15 from marc Zyngier:

 - A number of MIPS GIC updates and cleanups
 - One GICv4 update
 - Another firmware workaround for GICv2
 - Support for Mason8 GPIOs
 - Tiny documentation fix
parents 10d94ff4 61dc367e

Documentation/admin-guide/kernel-parameters.txt

+7 −0
Original line number Diff line number Diff line
@@ -1713,6 +1713,13 @@ 
	irqaffinity=	[SMP] Set the default irq affinity mask

			The argument is a cpu list, as described above.



	irqchip.gicv2_force_probe=

			[ARM, ARM64]

			Format: <bool>

			Force the kernel to look for the second 4kB page

			of a GICv2 controller even if the memory range

			exposed by the device tree is too small.



	irqfixup	[HW]

			When an interrupt is not handled search all handlers

			for it. Intended to get systems with badly broken

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/interrupt-controller/amlogic,meson-gpio-intc.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ number of interrupt exposed depends on the SoC. 
Required properties:



- compatible : must have "amlogic,meson8-gpio-intc” and either

   “amlogic,meson8-gpio-intc” for meson8 SoCs (S802) or

   “amlogic,meson8b-gpio-intc” for meson8b SoCs (S805) or

   “amlogic,meson-gxbb-gpio-intc” for GXBB SoCs (S905) or

   “amlogic,meson-gxl-gpio-intc” for GXL SoCs (S905X, S912)

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
@@ -8597,6 +8597,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>