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

Commit 1f6d8035 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Conflicts:
	arch/mips/net/bpf_jit.c
	drivers/net/can/flexcan.c

Both the flexcan and MIPS bpf_jit conflicts were cases of simple
overlapping changes.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a2aeb02a 98f75b82

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/input/atmel,maxtouch.txt

+0 −4
Original line number Diff line number Diff line
@@ -11,10 +11,6 @@ Required properties: 


Optional properties for main touchpad device:



- linux,gpio-keymap: An array of up to 4 entries indicating the Linux

    keycode generated by each GPIO. Linux keycodes are defined in

    <dt-bindings/input/input.h>.



- linux,gpio-keymap: When enabled, the SPT_GPIOPWN_T19 object sends messages

    on GPIO bit changes. An array of up to 8 entries can be provided

    indicating the Linux keycode mapped to each bit of the status byte,

Documentation/devicetree/bindings/sound/rockchip-i2s.txt

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ i2s@ff890000 { 
	#address-cells = <1>;

	#size-cells = <0>;

	dmas = <&pdma1 0>, <&pdma1 1>;

	dma-names = "rx", "tx";

	dma-names = "tx", "rx";

	clock-names = "i2s_hclk", "i2s_clk";

	clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>;

};

Documentation/devicetree/bindings/spi/spi-rockchip.txt

+6 −2
Original line number Diff line number Diff line
@@ -16,11 +16,15 @@ Required Properties: 
- clocks: Must contain an entry for each entry in clock-names.

- clock-names: Shall be "spiclk" for the transfer-clock, and "apb_pclk" for

			   the peripheral clock.

- #address-cells: should be 1.

- #size-cells: should be 0.



Optional Properties:



- dmas: DMA specifiers for tx and rx dma. See the DMA client binding,

		Documentation/devicetree/bindings/dma/dma.txt

- dma-names: DMA request names should include "tx" and "rx" if present.

- #address-cells: should be 1.

- #size-cells: should be 0.





Example:

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

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Required properties: 
	* "fsl,imx23-usbphy" for imx23 and imx28

	* "fsl,imx6q-usbphy" for imx6dq and imx6dl

	* "fsl,imx6sl-usbphy" for imx6sl

	* "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