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

Commit 37705c03 authored Jul 14, 2015 by Matt Wagantall

Merge branch 'v3.18.18_for_msm-3.18' into msm-3.18



Move msm-3.18 forward to upstream v3.18.18 (from v3.18.0)

Change-Id: I629bda1e31e58d93bde4a61dbaa2cf0e5baca97f
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>

parents 35afb780 3c457ff8

Documentation/devicetree/bindings/dma/fsl-mxs-dma.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -38,7 +38,7 @@ dma_apbx: dma-apbx@80024000 {
	80 81 68 69		80 81 68 69
	70 71 72 73		70 71 72 73
	74 75 76 77>;		74 75 76 77>;
	interrupt-names = "auart4-rx", "aurat4-tx", "spdif-tx", "empty",		interrupt-names = "auart4-rx", "auart4-tx", "spdif-tx", "empty",
	"saif0", "saif1", "i2c0", "i2c1",		"saif0", "saif1", "i2c0", "i2c1",
	"auart0-rx", "auart0-tx", "auart1-rx", "auart1-tx",		"auart0-rx", "auart0-tx", "auart1-rx", "auart1-tx",
	"auart2-rx", "auart2-tx", "auart3-rx", "auart3-tx";		"auart2-rx", "auart2-tx", "auart3-rx", "auart3-tx";

Documentation/devicetree/bindings/i2c/i2c-designware.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -14,10 +14,10 @@ Optional properties :
	- i2c-sda-hold-time-ns : should contain the SDA hold time in nanoseconds.		- i2c-sda-hold-time-ns : should contain the SDA hold time in nanoseconds.
	This option is only supported in hardware blocks version 1.11a or newer.		This option is only supported in hardware blocks version 1.11a or newer.

	- i2c-scl-falling-time : should contain the SCL falling time in nanoseconds.		- i2c-scl-falling-time-ns : should contain the SCL falling time in nanoseconds.
	This value which is by default 300ns is used to compute the tLOW period.		This value which is by default 300ns is used to compute the tLOW period.

	- i2c-sda-falling-time : should contain the SDA falling time in nanoseconds.		- i2c-sda-falling-time-ns : should contain the SDA falling time in nanoseconds.
	This value which is by default 300ns is used to compute the tHIGH period.		This value which is by default 300ns is used to compute the tHIGH period.

	Example :		Example :

Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	* Marvell Armada 370 / Armada XP Ethernet Controller (NETA)		* Marvell Armada 370 / Armada XP Ethernet Controller (NETA)

	Required properties:		Required properties:
	- compatible: should be "marvell,armada-370-neta".		- compatible: "marvell,armada-370-neta" or "marvell,armada-xp-neta".
	- reg: address and length of the register set for the device.		- reg: address and length of the register set for the device.
	- interrupts: interrupt for the device		- interrupts: interrupt for the device
	- phy: See ethernet.txt file in the same directory.		- phy: See ethernet.txt file in the same directory.

Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -92,5 +92,5 @@ mpp61 61 gpo, dev(wen1), uart1(txd), audio(rclk)
	mpp62 62 gpio, dev(a2), uart1(cts), tdm(drx), pcie(clkreq0),		mpp62 62 gpio, dev(a2), uart1(cts), tdm(drx), pcie(clkreq0),
	audio(mclk), uart0(cts)		audio(mclk), uart0(cts)
	mpp63 63 gpo, spi0(sck), tclk		mpp63 63 gpo, spi0(sck), tclk
	mpp64 64 gpio, spi0(miso), spi0-1(cs1)		mpp64 64 gpio, spi0(miso), spi0(cs1)
	mpp65 65 gpio, spi0(mosi), spi0-1(cs2)		mpp65 65 gpio, spi0(mosi), spi0(cs2)

Documentation/devicetree/bindings/pinctrl/marvell,armada-375-pinctrl.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -22,8 +22,8 @@ mpp5 5 gpio, dev(ad7), spi0(cs2), spi1(cs2)
	mpp6 6 gpio, dev(ad0), led(p1), audio(rclk)		mpp6 6 gpio, dev(ad0), led(p1), audio(rclk)
	mpp7 7 gpio, dev(ad1), ptp(clk), led(p2), audio(extclk)		mpp7 7 gpio, dev(ad1), ptp(clk), led(p2), audio(extclk)
	mpp8 8 gpio, dev (bootcs), spi0(cs0), spi1(cs0)		mpp8 8 gpio, dev (bootcs), spi0(cs0), spi1(cs0)
	mpp9 9 gpio, nf(wen), spi0(sck), spi1(sck)		mpp9 9 gpio, spi0(sck), spi1(sck), nand(we)
	mpp10 10 gpio, nf(ren), dram(vttctrl), led(c1)		mpp10 10 gpio, dram(vttctrl), led(c1), nand(re)
	mpp11 11 gpio, dev(a0), led(c2), audio(sdo)		mpp11 11 gpio, dev(a0), led(c2), audio(sdo)
	mpp12 12 gpio, dev(a1), audio(bclk)		mpp12 12 gpio, dev(a1), audio(bclk)
	mpp13 13 gpio, dev(readyn), pcie0(rstoutn), pcie1(rstoutn)		mpp13 13 gpio, dev(readyn), pcie0(rstoutn), pcie1(rstoutn)