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

Commit fbf9b0bb authored Nov 21, 2017 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Nov 21, 2017

Merge "Merge remote-tracking branch '4.9/tmp-ffc99722' into HEAD"

parents e0abb908 2f9940db

Documentation/devicetree/bindings/arm/davinci.txt

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -13,6 +13,10 @@ EnBW AM1808 based CMC board
	Required root node properties:		Required root node properties:
	- compatible = "enbw,cmc", "ti,da850;		- compatible = "enbw,cmc", "ti,da850;

			LEGO MINDSTORMS EV3 (AM1808 based)
			Required root node properties:
			- compatible = "lego,ev3", "ti,da850";

	Generic DaVinci Boards		Generic DaVinci Boards
	----------------------		----------------------

Documentation/devicetree/bindings/clock/qoriq-clock.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -31,6 +31,7 @@ Required properties:
	* "fsl,t4240-clockgen"		* "fsl,t4240-clockgen"
	* "fsl,b4420-clockgen"		* "fsl,b4420-clockgen"
	* "fsl,b4860-clockgen"		* "fsl,b4860-clockgen"
			* "fsl,ls1012a-clockgen"
	* "fsl,ls1021a-clockgen"		* "fsl,ls1021a-clockgen"
	Chassis-version clock strings include:		Chassis-version clock strings include:
	* "fsl,qoriq-clockgen-1.0": for chassis 1.0 clocks		* "fsl,qoriq-clockgen-1.0": for chassis 1.0 clocks

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -155,6 +155,7 @@ kosagi Sutajio Ko-Usagi PTE Ltd.
	kyo Kyocera Corporation		kyo Kyocera Corporation
	lacie LaCie		lacie LaCie
	lantiq Lantiq Semiconductor		lantiq Lantiq Semiconductor
			lego LEGO Systems A/S
	lenovo Lenovo Group Ltd.		lenovo Lenovo Group Ltd.
	lg LG Corporation		lg LG Corporation
	linux Linux-specific binding		linux Linux-specific binding

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 4		VERSION = 4
	PATCHLEVEL = 9		PATCHLEVEL = 9
	SUBLEVEL = 61		SUBLEVEL = 62
	EXTRAVERSION =		EXTRAVERSION =
	NAME = Roaring Lionus		NAME = Roaring Lionus

arch/arm/boot/dts/imx53-qsb-common.dtsi

+10 −10

Original line number	Original line	Diff line number	Diff line
	@@ -215,16 +215,16 @@

	pinctrl_fec: fecgrp {		pinctrl_fec: fecgrp {
	fsl,pins = <		fsl,pins = <
	MX53_PAD_FEC_MDC__FEC_MDC 0x80000000		MX53_PAD_FEC_MDC__FEC_MDC 0x4
	MX53_PAD_FEC_MDIO__FEC_MDIO 0x80000000		MX53_PAD_FEC_MDIO__FEC_MDIO 0x1fc
	MX53_PAD_FEC_REF_CLK__FEC_TX_CLK 0x80000000		MX53_PAD_FEC_REF_CLK__FEC_TX_CLK 0x180
	MX53_PAD_FEC_RX_ER__FEC_RX_ER 0x80000000		MX53_PAD_FEC_RX_ER__FEC_RX_ER 0x180
	MX53_PAD_FEC_CRS_DV__FEC_RX_DV 0x80000000		MX53_PAD_FEC_CRS_DV__FEC_RX_DV 0x180
	MX53_PAD_FEC_RXD1__FEC_RDATA_1 0x80000000		MX53_PAD_FEC_RXD1__FEC_RDATA_1 0x180
	MX53_PAD_FEC_RXD0__FEC_RDATA_0 0x80000000		MX53_PAD_FEC_RXD0__FEC_RDATA_0 0x180
	MX53_PAD_FEC_TX_EN__FEC_TX_EN 0x80000000		MX53_PAD_FEC_TX_EN__FEC_TX_EN 0x4
	MX53_PAD_FEC_TXD1__FEC_TDATA_1 0x80000000		MX53_PAD_FEC_TXD1__FEC_TDATA_1 0x4
	MX53_PAD_FEC_TXD0__FEC_TDATA_0 0x80000000		MX53_PAD_FEC_TXD0__FEC_TDATA_0 0x4
	>;		>;
	};		};