Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next (a604c96e) · Commits · e / devices / android_kernel_samsung_universal8895

Documentation/devicetree/bindings/powerpc/fsl/fman.txt

+70 −0

Original line number	Original line	Diff line number	Diff line
	@@ -7,6 +7,7 @@ CONTENTS
	- FMan MURAM Node		- FMan MURAM Node
	- FMan dTSEC/XGEC/mEMAC Node		- FMan dTSEC/XGEC/mEMAC Node
	- FMan IEEE 1588 Node		- FMan IEEE 1588 Node
			- FMan MDIO Node
	- Example		- Example

	=============================================================================		=============================================================================
	@@ -356,6 +357,69 @@ ptp-timer@fe000 {
	reg = <0xfe000 0x1000>;		reg = <0xfe000 0x1000>;
	};		};

			=============================================================================
			FMan MDIO Node

			DESCRIPTION

			The MDIO is a bus to which the PHY devices are connected.

			PROPERTIES

			- compatible
			Usage: required
			Value type: <stringlist>
			Definition: A standard property.
			Must include "fsl,fman-mdio" for 1 Gb/s MDIO from FMan v2.
			Must include "fsl,fman-xmdio" for 10 Gb/s MDIO from FMan v2.
			Must include "fsl,fman-memac-mdio" for 1/10 Gb/s MDIO from
			FMan v3.

			- reg
			Usage: required
			Value type: <prop-encoded-array>
			Definition: A standard property.

			- bus-frequency
			Usage: optional
			Value type: <u32>
			Definition: Specifies the external MDIO bus clock speed to
			be used, if different from the standard 2.5 MHz.
			This may be due to the standard speed being unsupported (e.g.
			due to a hardware problem), or to advertise that all relevant
			components in the system support a faster speed.

			- interrupts
			Usage: required for external MDIO
			Value type: <prop-encoded-array>
			Definition: Event interrupt of external MDIO controller.

			- fsl,fman-internal-mdio
			Usage: required for internal MDIO
			Value type: boolean
			Definition: Fman has internal MDIO for internal PCS(Physical
			Coding Sublayer) PHYs and external MDIO for external PHYs.
			The settings and programming routines for internal/external
			MDIO are different. Must be included for internal MDIO.

			EXAMPLE

			Example for FMan v2 external MDIO:

			mdio@f1000 {
			compatible = "fsl,fman-xmdio";
			reg = <0xf1000 0x1000>;
			interrupts = <101 2 0 0>;
			};

			Example for FMan v3 internal MDIO:

			mdio@f1000 {
			compatible = "fsl,fman-memac-mdio";
			reg = <0xf1000 0x1000>;
			fsl,fman-internal-mdio;
			};

	=============================================================================		=============================================================================
	Example		Example

	@@ -531,4 +595,10 @@ fman@400000 {
	compatible = "fsl,fman-ptp-timer";		compatible = "fsl,fman-ptp-timer";
	reg = <0xfe000 0x1000>;		reg = <0xfe000 0x1000>;
	};		};

			mdio@f1000 {
			compatible = "fsl,fman-xmdio";
			reg = <0xf1000 0x1000>;
			interrupts = <101 2 0 0>;
			};
	};		};

Documentation/devicetree/bindings/soc/fsl/bman.txt

+11 −1

Original line number	Original line	Diff line number	Diff line
	@@ -36,6 +36,11 @@ are located at offsets 0xbf8 and 0xbfc
	Value type: <prop-encoded-array>		Value type: <prop-encoded-array>
	Definition: Standard property. The error interrupt		Definition: Standard property. The error interrupt

			- fsl,bman-portals
			Usage: Required
			Value type: <phandle>
			Definition: Phandle to this BMan instance's portals

	- fsl,liodn		- fsl,liodn
	Usage: See pamu.txt		Usage: See pamu.txt
	Value type: <prop-encoded-array>		Value type: <prop-encoded-array>
	@@ -96,7 +101,7 @@ The example below shows a BMan FBPR dynamic allocation memory node

	bman_fbpr: bman-fbpr {		bman_fbpr: bman-fbpr {
	compatible = "fsl,bman-fbpr";		compatible = "fsl,bman-fbpr";
	alloc-ranges = <0 0 0xf 0xffffffff>;		alloc-ranges = <0 0 0x10 0>;
	size = <0 0x1000000>;		size = <0 0x1000000>;
	alignment = <0 0x1000000>;		alignment = <0 0x1000000>;
	};		};
	@@ -104,6 +109,10 @@ The example below shows a BMan FBPR dynamic allocation memory node

	The example below shows a (P4080) BMan CCSR-space node		The example below shows a (P4080) BMan CCSR-space node

			bportals: bman-portals@ff4000000 {
			...
			};

	crypto@300000 {		crypto@300000 {
	...		...
	fsl,bman = <&bman, 2>;		fsl,bman = <&bman, 2>;
	@@ -115,6 +124,7 @@ The example below shows a (P4080) BMan CCSR-space node
	reg = <0x31a000 0x1000>;		reg = <0x31a000 0x1000>;
	interrupts = <16 2 1 2>;		interrupts = <16 2 1 2>;
	fsl,liodn = <0x17>;		fsl,liodn = <0x17>;
			fsl,bman-portals = <&bportals>;
	memory-region = <&bman_fbpr>;		memory-region = <&bman_fbpr>;
	};		};

Documentation/devicetree/bindings/soc/fsl/qman.txt

+12 −2

Original line number	Original line	Diff line number	Diff line
	@@ -38,6 +38,11 @@ are located at offsets 0xbf8 and 0xbfc
	Value type: <prop-encoded-array>		Value type: <prop-encoded-array>
	Definition: Standard property. The error interrupt		Definition: Standard property. The error interrupt

			- fsl,qman-portals
			Usage: Required
			Value type: <phandle>
			Definition: Phandle to this QMan instance's portals

	- fsl,liodn		- fsl,liodn
	Usage: See pamu.txt		Usage: See pamu.txt
	Value type: <prop-encoded-array>		Value type: <prop-encoded-array>
	@@ -113,13 +118,13 @@ The example below shows a QMan FQD and a PFDR dynamic allocation memory nodes

	qman_fqd: qman-fqd {		qman_fqd: qman-fqd {
	compatible = "fsl,qman-fqd";		compatible = "fsl,qman-fqd";
	alloc-ranges = <0 0 0xf 0xffffffff>;		alloc-ranges = <0 0 0x10 0>;
	size = <0 0x400000>;		size = <0 0x400000>;
	alignment = <0 0x400000>;		alignment = <0 0x400000>;
	};		};
	qman_pfdr: qman-pfdr {		qman_pfdr: qman-pfdr {
	compatible = "fsl,qman-pfdr";		compatible = "fsl,qman-pfdr";
	alloc-ranges = <0 0 0xf 0xffffffff>;		alloc-ranges = <0 0 0x10 0>;
	size = <0 0x2000000>;		size = <0 0x2000000>;
	alignment = <0 0x2000000>;		alignment = <0 0x2000000>;
	};		};
	@@ -127,6 +132,10 @@ The example below shows a QMan FQD and a PFDR dynamic allocation memory nodes

	The example below shows a (P4080) QMan CCSR-space node		The example below shows a (P4080) QMan CCSR-space node

			qportals: qman-portals@ff4200000 {
			...
			};

	clockgen: global-utilities@e1000 {		clockgen: global-utilities@e1000 {
	...		...
	sysclk: sysclk {		sysclk: sysclk {
	@@ -154,6 +163,7 @@ The example below shows a (P4080) QMan CCSR-space node
	reg = <0x318000 0x1000>;		reg = <0x318000 0x1000>;
	interrupts = <16 2 1 3>		interrupts = <16 2 1 3>
	fsl,liodn = <0x16>;		fsl,liodn = <0x16>;
			fsl,qman-portals = <&qportals>;
	memory-region = <&qman_fqd &qman_pfdr>;		memory-region = <&qman_fqd &qman_pfdr>;
	clocks = <&platform_pll 1>;		clocks = <&platform_pll 1>;
	};		};

arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -50,6 +50,7 @@ ethernet@b0000 {
	fsl,num_tx_queues = <0x8>;		fsl,num_tx_queues = <0x8>;
	fsl,magic-packet;		fsl,magic-packet;
	local-mac-address = [ 00 00 00 00 00 00 ];		local-mac-address = [ 00 00 00 00 00 00 ];
			ranges;

	queue-group@b0000 {		queue-group@b0000 {
	#address-cells = <1>;		#address-cells = <1>;

arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -50,6 +50,7 @@ ethernet@b1000 {
	fsl,num_tx_queues = <0x8>;		fsl,num_tx_queues = <0x8>;
	fsl,magic-packet;		fsl,magic-packet;
	local-mac-address = [ 00 00 00 00 00 00 ];		local-mac-address = [ 00 00 00 00 00 00 ];
			ranges;

	queue-group@b1000 {		queue-group@b1000 {
	#address-cells = <1>;		#address-cells = <1>;