Merge branch 'ovl-fixes' into for-linus (e4d35be5) · Commits · e / devices / android_kernel_teracube_mt6765

.mailmap

+6 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ Björn Steinbrink <B.Steinbrink@gmx.de>
		Brian Avery <b.avery@hp.com>
		Brian King <brking@us.ibm.com>
		Christoph Hellwig <hch@lst.de>
		Christophe Ricard <christophe.ricard@gmail.com>
		Corey Minyard <minyard@acm.org>
		Damian Hobson-Garcia <dhobsong@igel.co.jp>
		David Brownell <david-b@pacbell.net>
		@@ -47,6 +48,9 @@ Felix Kuhling <fxkuehl@gmx.de>
		Felix Moeller <felix@derklecks.de>
		Filipe Lautert <filipe@icewall.org>
		Franck Bui-Huu <vagabon.xyz@gmail.com>
		Frank Rowand <frowand.list@gmail.com> <frowand@mvista.com>
		Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>
		Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>
		Frank Zago <fzago@systemfabricworks.com>
		Greg Kroah-Hartman <greg@echidna.(none)>
		Greg Kroah-Hartman <gregkh@suse.de>
		@@ -65,6 +69,7 @@ Jean Tourrilhes <jt@hpl.hp.com>
		Jeff Garzik <jgarzik@pretzel.yyz.us>
		Jens Axboe <axboe@suse.de>
		Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
		John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
		John Stultz <johnstul@us.ibm.com>
		<josh@joshtriplett.org> <josh@freedesktop.org>
		<josh@joshtriplett.org> <josh@kernel.org>
		@@ -78,6 +83,7 @@ Kay Sievers <kay.sievers@vrfy.org>
		Kenneth W Chen <kenneth.w.chen@intel.com>
		Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
		Koushik <raghavendra.koushik@neterion.com>
		Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
		Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
		Leonid I Ananiev <leonid.i.ananiev@intel.com>
		Linas Vepstas <linas@austin.ibm.com>

Documentation/ABI/testing/sysfs-platform-i2c-demux-pinctrl

+12 −17

Original line number	Diff line number	Diff line
		What: /sys/devices/platform/<i2c-demux-name>/cur_master
		What: /sys/devices/platform/<i2c-demux-name>/available_masters
		Date: January 2016
		KernelVersion: 4.6
		Contact: Wolfram Sang <wsa@the-dreams.de>
		Description:
		Reading the file will give you a list of masters which can be
		selected for a demultiplexed bus. The format is
		"<index>:<name>". Example from a Renesas Lager board:

		This file selects the active I2C master for a demultiplexed bus.
		0:/i2c@e6500000 1:/i2c@e6508000

		Write 0 there for the first master, 1 for the second etc. Reading the file will
		give you a list with the active master marked. Example from a Renesas Lager
		board:

		root@Lager:~# cat /sys/devices/platform/i2c@8/cur_master
		* 0 - /i2c@9
		1 - /i2c@e6520000
		2 - /i2c@e6530000

		root@Lager:~# echo 2 > /sys/devices/platform/i2c@8/cur_master

		root@Lager:~# cat /sys/devices/platform/i2c@8/cur_master
		0 - /i2c@9
		1 - /i2c@e6520000
		* 2 - /i2c@e6530000
		What: /sys/devices/platform/<i2c-demux-name>/current_master
		Date: January 2016
		KernelVersion: 4.6
		Contact: Wolfram Sang <wsa@the-dreams.de>
		Description:
		This file selects/shows the active I2C master for a demultiplexed
		bus. It uses the <index> value from the file 'available_masters'.

Documentation/devicetree/bindings/arm/cpus.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -192,7 +192,6 @@ nodes to be present and contain the properties described below.
		can be one of:
		"allwinner,sun6i-a31"
		"allwinner,sun8i-a23"
		"arm,psci"
		"arm,realview-smp"
		"brcm,bcm-nsp-smp"
		"brcm,brahma-b15"

Documentation/devicetree/bindings/ata/ahci-platform.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,10 @@ Optional properties:
		- target-supply : regulator for SATA target power
		- phys : reference to the SATA PHY node
		- phy-names : must be "sata-phy"
		- ports-implemented : Mask that indicates which ports that the HBA supports
		are available for software to use. Useful if PORTS_IMPL
		is not programmed by the BIOS, which is true with
		some embedded SOC's.

		Required properties when using sub-nodes:
		- #address-cells : number of cells to encode an address

Documentation/devicetree/bindings/clock/qca,ath79-pll.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@ Binding for Qualcomm Atheros AR7xxx/AR9XXX PLL controller
		The PPL controller provides the 3 main clocks of the SoC: CPU, DDR and AHB.

		Required Properties:
		- compatible: has to be "qca,<soctype>-cpu-intc" and one of the following
		- compatible: has to be "qca,<soctype>-pll" and one of the following
		fallbacks:
		- "qca,ar7100-pll"
		- "qca,ar7240-pll"
		@@ -21,8 +21,8 @@ Optional properties:

		Example:

		memory-controller@18050000 {
		compatible = "qca,ar9132-ppl", "qca,ar9130-pll";
		pll-controller@18050000 {
		compatible = "qca,ar9132-pll", "qca,ar9130-pll";
		reg = <0x18050000 0x20>;

		clock-names = "ref";