Merge remote-tracking branches 'asoc/topic/max9867', 'asoc/topic/mtk',... (a701802c) · Commits · e / devices / android_kernel_fairphone_FP4

.mailmap

+4 −0

Documentation/ABI/testing/sysfs-devices-deferred_probe

deleted100644 → 0

+0 −12

Original line number	Original line	Diff line number	Diff line
	What: /sys/devices/.../deferred_probe
	Date: August 2016
	Contact: Ben Hutchings <ben.hutchings@codethink.co.uk>
	Description:
	The /sys/devices/.../deferred_probe attribute is
	present for all devices. If a driver detects during
	probing a device that a related device is not yet
	ready, it may defer probing of the first device. The
	kernel will retry probing the first device after any
	other device is successfully probed. This attribute
	reads as 1 if probing of this device is currently
	deferred, or 0 otherwise.

Documentation/devicetree/bindings/i2c/i2c.txt

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -62,6 +62,9 @@ wants to support one of the below features, it should adapt the bindings below.
	"irq" and "wakeup" names are recognized by I2C core, other names are		"irq" and "wakeup" names are recognized by I2C core, other names are
	left to individual drivers.		left to individual drivers.

			- host-notify
			device uses SMBus host notify protocol instead of interrupt line.

	- multi-master		- multi-master
	states that there is another master active on this bus. The OS can use		states that there is another master active on this bus. The OS can use
	this information to adapt power management to keep the arbitration awake		this information to adapt power management to keep the arbitration awake
	@@ -81,6 +84,11 @@ Binding may contain optional "interrupts" property, describing interrupts
	used by the device. I2C core will assign "irq" interrupt (or the very first		used by the device. I2C core will assign "irq" interrupt (or the very first
	interrupt if not using interrupt names) as primary interrupt for the slave.		interrupt if not using interrupt names) as primary interrupt for the slave.

			Alternatively, devices supporting SMbus Host Notify, and connected to
			adapters that support this feature, may use "host-notify" property. I2C
			core will create a virtual interrupt for Host Notify and assign it as
			primary interrupt for the slave.

	Also, if device is marked as a wakeup source, I2C core will set up "wakeup"		Also, if device is marked as a wakeup source, I2C core will set up "wakeup"
	interrupt for the device. If "wakeup" interrupt name is not present in the		interrupt for the device. If "wakeup" interrupt name is not present in the
	binding, then primary interrupt will be used as wakeup interrupt.		binding, then primary interrupt will be used as wakeup interrupt.

Documentation/devicetree/bindings/interrupt-controller/snps,archs-idu-intc.txt

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -15,6 +15,9 @@ Properties:
	Second cell specifies the irq distribution mode to cores		Second cell specifies the irq distribution mode to cores
	0=Round Robin; 1=cpu0, 2=cpu1, 4=cpu2, 8=cpu3		0=Round Robin; 1=cpu0, 2=cpu1, 4=cpu2, 8=cpu3

			The second cell in interrupts property is deprecated and may be ignored by
			the kernel.

	intc accessed via the special ARC AUX register interface, hence "reg" property		intc accessed via the special ARC AUX register interface, hence "reg" property
	is not specified.		is not specified.

Documentation/devicetree/bindings/mtd/tango-nand.txt

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -5,7 +5,7 @@ Required properties:
	- compatible: "sigma,smp8758-nand"		- compatible: "sigma,smp8758-nand"
	- reg: address/size of nfc_reg, nfc_mem, and pbus_reg		- reg: address/size of nfc_reg, nfc_mem, and pbus_reg
	- dmas: reference to the DMA channel used by the controller		- dmas: reference to the DMA channel used by the controller
	- dma-names: "nfc_sbox"		- dma-names: "rxtx"
	- clocks: reference to the system clock		- clocks: reference to the system clock
	- #address-cells: <1>		- #address-cells: <1>
	- #size-cells: <0>		- #size-cells: <0>
	@@ -17,9 +17,9 @@ Example:

	nandc: nand-controller@2c000 {		nandc: nand-controller@2c000 {
	compatible = "sigma,smp8758-nand";		compatible = "sigma,smp8758-nand";
	reg = <0x2c000 0x30 0x2d000 0x800 0x20000 0x1000>;		reg = <0x2c000 0x30>, <0x2d000 0x800>, <0x20000 0x1000>;
	dmas = <&dma0 3>;		dmas = <&dma0 3>;
	dma-names = "nfc_sbox";		dma-names = "rxtx";
	clocks = <&clkgen SYS_CLK>;		clocks = <&clkgen SYS_CLK>;
	#address-cells = <1>;		#address-cells = <1>;
	#size-cells = <0>;		#size-cells = <0>;

Original line number	Original line	Diff line number	Diff line
	@@ -137,6 +137,7 @@ Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
	Rudolf Marek <R.Marek@sh.cvut.cz>		Rudolf Marek <R.Marek@sh.cvut.cz>
	Rui Saraiva <rmps@joel.ist.utl.pt>		Rui Saraiva <rmps@joel.ist.utl.pt>
	Sachin P Sant <ssant@in.ibm.com>		Sachin P Sant <ssant@in.ibm.com>
			Sarangdhar Joshi <spjoshi@codeaurora.org>
	Sam Ravnborg <sam@mars.ravnborg.org>		Sam Ravnborg <sam@mars.ravnborg.org>
	Santosh Shilimkar <ssantosh@kernel.org>		Santosh Shilimkar <ssantosh@kernel.org>
	Santosh Shilimkar <santosh.shilimkar@oracle.org>		Santosh Shilimkar <santosh.shilimkar@oracle.org>
	@@ -150,10 +151,13 @@ Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
	Simon Kelley <simon@thekelleys.org.uk>		Simon Kelley <simon@thekelleys.org.uk>
	Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>		Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
	Stephen Hemminger <shemminger@osdl.org>		Stephen Hemminger <shemminger@osdl.org>
			Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
			Subhash Jadavani <subhashj@codeaurora.org>
	Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>		Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
	Sumit Semwal <sumit.semwal@ti.com>		Sumit Semwal <sumit.semwal@ti.com>
	Tejun Heo <htejun@gmail.com>		Tejun Heo <htejun@gmail.com>
	Thomas Graf <tgraf@suug.ch>		Thomas Graf <tgraf@suug.ch>
			Thomas Pedersen <twp@codeaurora.org>
	Tony Luck <tony.luck@intel.com>		Tony Luck <tony.luck@intel.com>
	Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>		Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
	Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>		Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>