Commit 692665c6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.10-rc5 into usb-next 



We need the USB fixes in here as well to handle future merge issues and
dependancies.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents afa197e3 7a308bb3

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

+3 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ Required properties: 
- compatible: "sigma,smp8758-nand"

- reg: address/size of nfc_reg, nfc_mem, and pbus_reg

- dmas: reference to the DMA channel used by the controller

- dma-names: "nfc_sbox"

- dma-names: "rxtx"

- clocks: reference to the system clock

- #address-cells: <1>

- #size-cells: <0>
@@ -17,9 +17,9 @@ Example: 


	nandc: nand-controller@2c000 {

		compatible = "sigma,smp8758-nand";

		reg = <0x2c000 0x30 0x2d000 0x800 0x20000 0x1000>;

		reg = <0x2c000 0x30>, <0x2d000 0x800>, <0x20000 0x1000>;

		dmas = <&dma0 3>;

		dma-names = "nfc_sbox";

		dma-names = "rxtx";

		clocks = <&clkgen SYS_CLK>;

		#address-cells = <1>;

		#size-cells = <0>;

Documentation/devicetree/bindings/net/ti,dp83867.txt

+4 −2
Original line number Diff line number Diff line
@@ -3,9 +3,11 @@ 
Required properties:

	- reg - The ID number for the phy, usually a small integer

	- ti,rx-internal-delay - RGMII Receive Clock Delay - see dt-bindings/net/ti-dp83867.h

		for applicable values

		for applicable values. Required only if interface type is

		PHY_INTERFACE_MODE_RGMII_ID or PHY_INTERFACE_MODE_RGMII_RXID

	- ti,tx-internal-delay - RGMII Transmit Clock Delay - see dt-bindings/net/ti-dp83867.h

		for applicable values

		for applicable values. Required only if interface type is

		PHY_INTERFACE_MODE_RGMII_ID or PHY_INTERFACE_MODE_RGMII_TXID

	- ti,fifo-depth - Transmitt FIFO depth- see dt-bindings/net/ti-dp83867.h

		for applicable values

Documentation/devicetree/bindings/spi/sh-msiof.txt

+13 −6
Original line number Diff line number Diff line 
Renesas MSIOF spi controller



Required properties:

- compatible           : "renesas,msiof-<soctype>" for SoCs,

			 "renesas,sh-msiof" for SuperH, or

			 "renesas,sh-mobile-msiof" for SH Mobile series.

			 Examples with soctypes are:

			 "renesas,msiof-r8a7790" (R-Car H2)

- compatible           : "renesas,msiof-r8a7790" (R-Car H2)

			 "renesas,msiof-r8a7791" (R-Car M2-W)

			 "renesas,msiof-r8a7792" (R-Car V2H)

			 "renesas,msiof-r8a7793" (R-Car M2-N)

			 "renesas,msiof-r8a7794" (R-Car E2)

			 "renesas,msiof-r8a7796" (R-Car M3-W)

			 "renesas,msiof-sh73a0" (SH-Mobile AG5)

			 "renesas,sh-mobile-msiof" (generic SH-Mobile compatibile device)

			 "renesas,rcar-gen2-msiof" (generic R-Car Gen2 compatible device)

			 "renesas,rcar-gen3-msiof" (generic R-Car Gen3 compatible device)

			 "renesas,sh-msiof"      (deprecated)



			 When compatible with the generic version, nodes

			 must list the SoC-specific version corresponding

			 to the platform first followed by the generic

			 version.



- reg                  : A list of offsets and lengths of the register sets for

			 the device.

			 If only one register set is present, it is to be used
@@ -61,7 +67,8 @@ Documentation/devicetree/bindings/pinctrl/renesas,*. 
Example:



	msiof0: spi@e6e20000 {

		compatible = "renesas,msiof-r8a7791";

		compatible = "renesas,msiof-r8a7791",

			     "renesas,rcar-gen2-msiof";

		reg = <0 0xe6e20000 0 0x0064>;

		interrupts = <0 156 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp0_clks R8A7791_CLK_MSIOF0>;

MAINTAINERS

+9 −2
Original line number Diff line number Diff line
@@ -976,6 +976,7 @@ M: Russell King <linux@armlinux.org.uk> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://www.armlinux.org.uk/

S:	Maintained

T:	git git://git.armlinux.org.uk/~rmk/linux-arm.git

F:	arch/arm/



ARM SUB-ARCHITECTURES
@@ -1153,6 +1154,7 @@ ARM/CLKDEV SUPPORT 
M:	Russell King <linux@armlinux.org.uk>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

T:	git git://git.armlinux.org.uk/~rmk/linux-arm.git clkdev

F:	arch/arm/include/asm/clkdev.h

F:	drivers/clk/clkdev.c
@@ -1688,6 +1690,7 @@ M: Krzysztof Kozlowski <krzk@kernel.org> 
R:	Javier Martinez Canillas <javier@osg.samsung.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)

Q:	https://patchwork.kernel.org/project/linux-samsung-soc/list/

S:	Maintained

F:	arch/arm/boot/dts/s3c*

F:	arch/arm/boot/dts/s5p*
@@ -7697,8 +7700,10 @@ F: drivers/net/dsa/mv88e6xxx/ 
F:	Documentation/devicetree/bindings/net/dsa/marvell.txt



MARVELL ARMADA DRM SUPPORT

M:	Russell King <rmk+kernel@armlinux.org.uk>

M:	Russell King <linux@armlinux.org.uk>

S:	Maintained

T:	git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-armada-devel

T:	git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-armada-fixes

F:	drivers/gpu/drm/armada/

F:	include/uapi/drm/armada_drm.h

F:	Documentation/devicetree/bindings/display/armada/
@@ -8903,8 +8908,10 @@ S: Supported 
F:	drivers/nfc/nxp-nci



NXP TDA998X DRM DRIVER

M:	Russell King <rmk+kernel@armlinux.org.uk>

M:	Russell King <linux@armlinux.org.uk>

S:	Supported

T:	git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-devel

T:	git git://git.armlinux.org.uk/~rmk/linux-arm.git drm-tda998x-fixes

F:	drivers/gpu/drm/i2c/tda998x_drv.c

F:	include/drm/i2c/tda998x.h

Makefile

+2 −2
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 10

SUBLEVEL = 0

EXTRAVERSION = -rc4

NAME = Roaring Lionus

EXTRAVERSION = -rc5

NAME = Anniversary Edition



# *DOCUMENTATION*

# To see a list of typical targets execute "make help"