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

Commit c6f66347 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 8xx hugepage support, qbman fixes/cleanup, device
tree updates, and some misc cleanup."
parents ff45000f baae856e

Documentation/devicetree/bindings/i2c/trivial-devices.txt

+1 −0
Original line number Diff line number Diff line
@@ -158,4 +158,5 @@ ti,tsc2003 I2C Touch-Screen Controller 
ti,tmp102		Low Power Digital Temperature Sensor with SMBUS/Two Wire Serial Interface

ti,tmp103		Low Power Digital Temperature Sensor with SMBUS/Two Wire Serial Interface

ti,tmp275		Digital Temperature Sensor

winbond,w83793		Winbond/Nuvoton H/W Monitor

winbond,wpct301		i2c trusted platform module (TPM)

arch/powerpc/boot/dts/fsl/t1023rdb.dts

+29 −0
Original line number Diff line number Diff line
@@ -41,6 +41,27 @@ 
	#size-cells = <2>;

	interrupt-parent = <&mpic>;



	reserved-memory {

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



		bman_fbpr: bman-fbpr {

			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>;

		};

	};



	ifc: localbus@ffe124000 {

		reg = <0xf 0xfe124000 0 0x2000>;

		ranges = <0 0 0xf 0xe8000000 0x08000000
@@ -72,6 +93,14 @@ 
		ranges = <0x00000000 0xf 0x00000000 0x01072000>;

	};



	bportals: bman-portals@ff4000000 {

		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/t1023si-post.dtsi

+103 −0
Original line number Diff line number Diff line
@@ -34,6 +34,21 @@ 


#include <dt-bindings/thermal/thermal.h>



&bman_fbpr {

	compatible = "fsl,bman-fbpr";

	alloc-ranges = <0 0 0x10000 0>;

};



&qman_fqd {

	compatible = "fsl,qman-fqd";

	alloc-ranges = <0 0 0x10000 0>;

};



&qman_pfdr {

	compatible = "fsl,qman-pfdr";

	alloc-ranges = <0 0 0x10000 0>;

};



&ifc {

	#address-cells = <2>;

	#size-cells = <1>;
@@ -180,6 +195,92 @@ 
	};

};



&bportals {

	#address-cells = <0x1>;

	#size-cells = <0x1>;

	compatible = "simple-bus";



	bman-portal@0 {

		cell-index = <0x0>;

		compatible = "fsl,bman-portal";

		reg = <0x0 0x4000>, <0x1000000 0x1000>;

		interrupts = <105 2 0 0>;

	};

	bman-portal@4000 {

		cell-index = <0x1>;

		compatible = "fsl,bman-portal";

		reg = <0x4000 0x4000>, <0x1001000 0x1000>;

		interrupts = <107 2 0 0>;

	};

	bman-portal@8000 {

		cell-index = <2>;

		compatible = "fsl,bman-portal";

		reg = <0x8000 0x4000>, <0x1002000 0x1000>;

		interrupts = <109 2 0 0>;

	};

	bman-portal@c000 {

		cell-index = <0x3>;

		compatible = "fsl,bman-portal";

		reg = <0xc000 0x4000>, <0x1003000 0x1000>;

		interrupts = <111 2 0 0>;

	};

	bman-portal@10000 {

		cell-index = <0x4>;

		compatible = "fsl,bman-portal";

		reg = <0x10000 0x4000>, <0x1004000 0x1000>;

		interrupts = <113 2 0 0>;

	};

	bman-portal@14000 {

		cell-index = <0x5>;

		compatible = "fsl,bman-portal";

		reg = <0x14000 0x4000>, <0x1005000 0x1000>;

		interrupts = <115 2 0 0>;

	};

};



&qportals {

	#address-cells = <0x1>;

	#size-cells = <0x1>;

	compatible = "simple-bus";



	qportal0: qman-portal@0 {

		compatible = "fsl,qman-portal";

		reg = <0x0 0x4000>, <0x1000000 0x1000>;

		interrupts = <104 0x2 0 0>;

		cell-index = <0x0>;

	};

	qportal1: qman-portal@4000 {

		compatible = "fsl,qman-portal";

		reg = <0x4000 0x4000>, <0x1001000 0x1000>;

		interrupts = <106 0x2 0 0>;

		cell-index = <0x1>;

	};

	qportal2: qman-portal@8000 {

		compatible = "fsl,qman-portal";

		reg = <0x8000 0x4000>, <0x1002000 0x1000>;

		interrupts = <108 0x2 0 0>;

		cell-index = <0x2>;

	};

	qportal3: qman-portal@c000 {

		compatible = "fsl,qman-portal";

		reg = <0xc000 0x4000>, <0x1003000 0x1000>;

		interrupts = <110 0x2 0 0>;

		cell-index = <0x3>;

	};

	qportal4: qman-portal@10000 {

		compatible = "fsl,qman-portal";

		reg = <0x10000 0x4000>, <0x1004000 0x1000>;

		interrupts = <112 0x2 0 0>;

		cell-index = <0x4>;

	};

	qportal5: qman-portal@14000 {

		compatible = "fsl,qman-portal";

		reg = <0x14000 0x4000>, <0x1005000 0x1000>;

		interrupts = <114 0x2 0 0>;

		cell-index = <0x5>;

	};

};



&soc {

	#address-cells = <1>;

	#size-cells = <1>;
@@ -413,6 +514,8 @@ 
	};



/include/ "qoriq-sec5.0-0.dtsi"

/include/ "qoriq-qman3.dtsi"

/include/ "qoriq-bman1.dtsi"



/include/ "qoriq-fman3l-0.dtsi"

/include/ "qoriq-fman3-0-10g-0-best-effort.dtsi"

arch/powerpc/boot/dts/fsl/t1024qds.dts

+29 −0
Original line number Diff line number Diff line
@@ -41,6 +41,27 @@ 
	#size-cells = <2>;

	interrupt-parent = <&mpic>;



	reserved-memory {

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



		bman_fbpr: bman-fbpr {

			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>;

		};

	};



	ifc: localbus@ffe124000 {

		reg = <0xf 0xfe124000 0 0x2000>;

		ranges = <0 0 0xf 0xe8000000 0x08000000
@@ -80,6 +101,14 @@ 
		ranges = <0x00000000 0xf 0x00000000 0x01072000>;

	};



	bportals: bman-portals@ff4000000 {

		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/t1024rdb.dts

+33 −0
Original line number Diff line number Diff line
@@ -41,6 +41,31 @@ 
	#size-cells = <2>;

	interrupt-parent = <&mpic>;



	aliases {

		sg_2500_aqr105_phy4 = &sg_2500_aqr105_phy4;

	};



	reserved-memory {

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



		bman_fbpr: bman-fbpr {

			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>;

		};

	};



	ifc: localbus@ffe124000 {

		reg = <0xf 0xfe124000 0 0x2000>;

		ranges = <0 0 0xf 0xe8000000 0x08000000
@@ -82,6 +107,14 @@ 
		ranges = <0x00000000 0xf 0x00000000 0x01072000>;

	};



	bportals: bman-portals@ff4000000 {

		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>;