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

Commit 4cd41ffd authored by Felipe Balbi's avatar Felipe Balbi
Browse files

Merge tag 'v3.17-rc5' into next 



Linux 3.17-rc5

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>

Conflicts:
	Documentation/devicetree/bindings/usb/mxs-phy.txt
	drivers/usb/phy/phy-mxs-usb.c
parents d9152161 9e82bf01

Documentation/devicetree/bindings/dma/rcar-audmapp.txt

+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ Example: 
* DMA client



Required properties:

- dmas:		a list of <[DMA multiplexer phandle] [SRS/DRS value]> pairs,

		where SRS/DRS values are fixed handles, specified in the SoC

		manual as the value that would be written into the PDMACHCR.

- dmas:		a list of <[DMA multiplexer phandle] [SRS << 8 | DRS]> pairs.

		where SRS/DRS are specified in the SoC manual.

		It will be written into PDMACHCR as high 16-bit parts.

- dma-names:	a list of DMA channel names, one per "dmas" entry



Example:

Documentation/devicetree/bindings/net/stmmac.txt

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ Optional properties: 
  further clocks may be specified in derived bindings.

- clock-names: One name for each entry in the clocks property, the

  first one should be "stmmaceth".

- clk_ptp_ref: this is the PTP reference clock; in case of the PTP is

  available this clock is used for programming the Timestamp Addend Register.

  If not passed then the system clock will be used and this is fine on some

  platforms.



Examples:

Documentation/devicetree/bindings/usb/mxs-phy.txt

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Required properties: 
	* "fsl,imx6q-usbphy" for imx6dq and imx6dl

	* "fsl,imx6sl-usbphy" for imx6sl

	* "fsl,vf610-usbphy" for Vybrid vf610

	* "fsl,imx6sx-usbphy" for imx6sx

  "fsl,imx23-usbphy" is still a fallback for other strings

- reg: Should contain registers location and length

- interrupts: Should contain phy interrupt

Documentation/devicetree/bindings/video/analog-tv-connector.txt

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ Analog TV Connector 
===================



Required properties:

- compatible: "composite-connector" or "svideo-connector"

- compatible: "composite-video-connector" or "svideo-connector"



Optional properties:

- label: a symbolic name for the connector
@@ -14,7 +14,7 @@ Example 
-------



tv: connector {

	compatible = "composite-connector";

	compatible = "composite-video-connector";

	label = "tv";



	port {

Documentation/kernel-parameters.txt

+1 −0
Original line number Diff line number Diff line
@@ -3541,6 +3541,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
					bogus residue values);

				s = SINGLE_LUN (the device has only one

					Logical Unit);

				u = IGNORE_UAS (don't bind to the uas driver);

				w = NO_WP_DETECT (don't test whether the

					medium is write-protected).

			Example: quirks=0419:aaf5:rl,0421:0433:rc