Commit 6096f884 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next 

Freescale updates from Scott:

"Highlights include more 8xx optimizations, an e6500 hugetlb optimization,
QMan device tree nodes, t1024/t1023 support, and various fixes and
cleanup."
parents f2931069 f1b3b445

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

+13 −0
Original line number Diff line number Diff line
@@ -189,6 +189,19 @@ PROPERTIES 
		Definition: There is one reg region describing the port

		configuration registers.



- fsl,fman-10g-port

		Usage: optional

		Value type: boolean

		Definition: The default port rate is 1G.

		If this property exists, the port is s 10G port.



- fsl,fman-best-effort-port

		Usage: optional

		Value type: boolean

		Definition: Can be defined only if 10G-support is set.

		This property marks a best-effort 10G port (10G port that

		may not be capable of line rate).



EXAMPLE



port@a8000 {

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

+5 −0
Original line number Diff line number Diff line
@@ -9,6 +9,11 @@ Required properties: 


 - compatible : Should define the compatible device type for

   global-utilities.

   Possible compatibles:

	"fsl,qoriq-device-config-1.0"

	"fsl,qoriq-device-config-2.0"

	"fsl,<chip>-device-config"

	"fsl,<chip>-guts"

 - reg : Offset and length of the register set for the device.



Recommended properties:

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

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ PROPERTIES 


	For additional details about the PAMU/LIODN binding(s) see pamu.txt



- fsl,qman-channel-id

- cell-index

	Usage:		Required

	Value type:	<u32>

	Definition:	The hardware index of the channel. This can also be
@@ -136,7 +136,7 @@ The example below shows a (P4080) QMan portals container/bus node with two porta 
			reg = <0x4000 0x4000>, <0x101000 0x1000>;

			interrupts = <106 2 0 0>;

			fsl,liodn = <3 4>;

			fsl,qman-channel-id = <1>;

			cell-index = <1>;



			fman0 {

				fsl,liodn = <0x22>;

arch/powerpc/boot/dts/b4qds.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -106,6 +106,14 @@ 
			size = <0 0x1000000>;

			alignment = <0 0x1000000>;

		};

		qman_fqd: qman-fqd {

			size = <0 0x400000>;

			alignment = <0 0x400000>;

		};

		qman_pfdr: qman-pfdr {

			size = <0 0x2000000>;

			alignment = <0 0x2000000>;

		};

	};



	dcsr: dcsr@f00000000 {
@@ -116,6 +124,10 @@ 
		ranges = <0x0 0xf 0xf4000000 0x2000000>;

	};



	qportals: qman-portals@ff6000000 {

		ranges = <0x0 0xf 0xf6000000 0x2000000>;

	};



	soc: soc@ffe000000 {

		ranges = <0x00000000 0xf 0xfe000000 0x1000000>;

		reg = <0xf 0xfe000000 0 0x00001000>;

arch/powerpc/boot/dts/fsl/b4420si-post.dtsi

+2 −13
Original line number Diff line number Diff line
@@ -80,20 +80,9 @@ 
		compatible = "fsl,b4420-device-config", "fsl,qoriq-device-config-2.0";

	};



/include/ "qoriq-clockgen2.dtsi"

	global-utilities@e1000 {

		compatible = "fsl,b4420-clockgen", "fsl,qoriq-clockgen-2.0";



		mux0: mux0@0 {

			#clock-cells = <0>;

			reg = <0x0 0x4>;

			compatible = "fsl,qoriq-core-mux-2.0";

			clocks = <&pll0 0>, <&pll0 1>, <&pll0 2>,

				<&pll1 0>, <&pll1 1>, <&pll1 2>;

			clock-names = "pll0", "pll0-div2", "pll0-div4",

				"pll1", "pll1-div2", "pll1-div4";

			clock-output-names = "cmux0";

		};

		compatible = "fsl,b4420-clockgen", "fsl,b4-clockgen",

			      "fsl,qoriq-clockgen-2.0";

	};



	rcpm: global-utilities@e2000 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE