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

Commit 28ea605c 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 BMan device tree nodes, an MSI erratum workaround, a
couple minor performance improvements, config updates, and misc
fixes/cleanup."
parents 6a840791 d41444da

arch/powerpc/boot/dts/b4860emu.dts

deleted100644 → 0
+0 −223
Original line number Diff line number Diff line 
/*

 * B4860 emulator Device Tree Source

 *

 * Copyright 2013 Freescale Semiconductor Inc.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are met:

 *     * Redistributions of source code must retain the above copyright

 *       notice, this list of conditions and the following disclaimer.

 *     * Redistributions in binary form must reproduce the above copyright

 *       notice, this list of conditions and the following disclaimer in the

 *       documentation and/or other materials provided with the distribution.

 *     * Neither the name of Freescale Semiconductor nor the

 *       names of its contributors may be used to endorse or promote products

 *       derived from this software without specific prior written permission.

 *

 *

 * ALTERNATIVELY, this software may be distributed under the terms of the

 * GNU General Public License ("GPL") as published by the Free Software

 * Foundation, either version 2 of that License or (at your option) any

 * later version.

 *

 * This software is provided by Freescale Semiconductor "as is" and any

 * express or implied warranties, including, but not limited to, the implied

 * warranties of merchantability and fitness for a particular purpose are

 * disclaimed. In no event shall Freescale Semiconductor be liable for any

 * direct, indirect, incidental, special, exemplary, or consequential damages

 * (including, but not limited to, procurement of substitute goods or services;

 * loss of use, data, or profits; or business interruption) however caused and

 * on any theory of liability, whether in contract, strict liability, or tort

 * (including negligence or otherwise) arising in any way out of the use of

 * this software, even if advised of the possibility of such damage.

 */



/dts-v1/;



/include/ "fsl/e6500_power_isa.dtsi"



/ {

	compatible = "fsl,B4860";

	#address-cells = <2>;

	#size-cells = <2>;

	interrupt-parent = <&mpic>;



	aliases {

		ccsr = &soc;



		serial0 = &serial0;

		serial1 = &serial1;

		serial2 = &serial2;

		serial3 = &serial3;

		dma0 = &dma0;

		dma1 = &dma1;

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;



		cpu0: PowerPC,e6500@0 {

			device_type = "cpu";

			reg = <0 1>;

			next-level-cache = <&L2>;

			fsl,portid-mapping = <0x80000000>;

		};

		cpu1: PowerPC,e6500@2 {

			device_type = "cpu";

			reg = <2 3>;

			next-level-cache = <&L2>;

			fsl,portid-mapping = <0x80000000>;

		};

		cpu2: PowerPC,e6500@4 {

			device_type = "cpu";

			reg = <4 5>;

			next-level-cache = <&L2>;

			fsl,portid-mapping = <0x80000000>;

		};

		cpu3: PowerPC,e6500@6 {

			device_type = "cpu";

			reg = <6 7>;

			next-level-cache = <&L2>;

			fsl,portid-mapping = <0x80000000>;

		};

	};

};



/ {

	model = "fsl,B4860QDS";

	compatible = "fsl,B4860EMU", "fsl,B4860QDS";

	#address-cells = <2>;

	#size-cells = <2>;

	interrupt-parent = <&mpic>;



	ifc: localbus@ffe124000 {

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

		ranges = <0 0 0xf 0xe8000000 0x08000000

			  2 0 0xf 0xff800000 0x00010000

			  3 0 0xf 0xffdf0000 0x00008000>;



		nor@0,0 {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "cfi-flash";

			reg = <0x0 0x0 0x8000000>;

			bank-width = <2>;

			device-width = <1>;

		};

	};



	memory {

		device_type = "memory";

	};



	soc: soc@ffe000000 {

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

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

	};

};



&ifc {

	#address-cells = <2>;

	#size-cells = <1>;

	compatible = "fsl,ifc", "simple-bus";

	interrupts = <25 2 0 0>;

};



&soc {

	#address-cells = <1>;

	#size-cells = <1>;

	device_type = "soc";

	compatible = "simple-bus";



	soc-sram-error {

		compatible = "fsl,soc-sram-error";

		interrupts = <16 2 1 2>;

	};



	corenet-law@0 {

		compatible = "fsl,corenet-law";

		reg = <0x0 0x1000>;

		fsl,num-laws = <32>;

	};



	ddr1: memory-controller@8000 {

		compatible = "fsl,qoriq-memory-controller-v4.5", "fsl,qoriq-memory-controller";

		reg = <0x8000 0x1000>;

		interrupts = <16 2 1 8>;

	};



	ddr2: memory-controller@9000 {

		compatible = "fsl,qoriq-memory-controller-v4.5","fsl,qoriq-memory-controller";

		reg = <0x9000 0x1000>;

		interrupts = <16 2 1 9>;

	};



	cpc: l3-cache-controller@10000 {

		compatible = "fsl,b4-l3-cache-controller", "cache";

		reg = <0x10000 0x1000

		       0x11000 0x1000>;

		interrupts = <16 2 1 4>;

	};



	corenet-cf@18000 {

		compatible = "fsl,corenet2-cf", "fsl,corenet-cf";

		reg = <0x18000 0x1000>;

		interrupts = <16 2 1 0>;

		fsl,ccf-num-csdids = <32>;

		fsl,ccf-num-snoopids = <32>;

	};



	iommu@20000 {

		compatible = "fsl,pamu-v1.0", "fsl,pamu";

		reg = <0x20000 0x4000>;

		fsl,portid-mapping = <0x8000>;

		#address-cells = <1>;

		#size-cells = <1>;

		interrupts = <

			24 2 0 0

			16 2 1 1>;

		pamu0: pamu@0 {

			reg = <0 0x1000>;

			fsl,primary-cache-geometry = <8 1>;

			fsl,secondary-cache-geometry = <32 2>;

		};

	};



/include/ "fsl/qoriq-mpic.dtsi"



	guts: global-utilities@e0000 {

		compatible = "fsl,b4-device-config";

		reg = <0xe0000 0xe00>;

		fsl,has-rstcr;

		fsl,liodn-bits = <12>;

	};



/include/ "fsl/qoriq-clockgen2.dtsi"

	global-utilities@e1000 {

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

	};



/include/ "fsl/qoriq-dma-0.dtsi"

	dma@100300 {

		fsl,iommu-parent = <&pamu0>;

		fsl,liodn-reg = <&guts 0x580>; /* DMA1LIODNR */

	};



/include/ "fsl/qoriq-dma-1.dtsi"

	dma@101300 {

		fsl,iommu-parent = <&pamu0>;

		fsl,liodn-reg = <&guts 0x584>; /* DMA2LIODNR */

	};



/include/ "fsl/qoriq-i2c-0.dtsi"

/include/ "fsl/qoriq-i2c-1.dtsi"

/include/ "fsl/qoriq-duart-0.dtsi"

/include/ "fsl/qoriq-duart-1.dtsi"



	L2: l2-cache-controller@c20000 {

		compatible = "fsl,b4-l2-cache-controller";

		reg = <0xc20000 0x1000>;

		next-level-cache = <&cpc>;

	};

};

arch/powerpc/boot/dts/b4qds.dtsi

+16 −1
Original line number Diff line number Diff line 
/*

 * B4420DS Device Tree Source

 *

 * Copyright 2012 Freescale Semiconductor, Inc.

 * Copyright 2012 - 2014 Freescale Semiconductor, Inc.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are met:
@@ -97,10 +97,25 @@ 
		device_type = "memory";

	};



	reserved-memory {

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



		bman_fbpr: bman-fbpr {

			size = <0 0x1000000>;

			alignment = <0 0x1000000>;

		};

	};



	dcsr: dcsr@f00000000 {

		ranges = <0x00000000 0xf 0x00000000 0x01052000>;

	};



	bportals: bman-portals@ff4000000 {

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

	};



	soc: soc@ffe000000 {

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

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

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

+59 −1
Original line number Diff line number Diff line 
/*

 * B4860 Silicon/SoC Device Tree Source (post include)

 *

 * Copyright 2012 Freescale Semiconductor Inc.

 * Copyright 2012 - 2014 Freescale Semiconductor Inc.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are met:
@@ -109,6 +109,64 @@ 
	};

};



&bportals {

	bman-portal@38000 {

		compatible = "fsl,bman-portal";

		reg = <0x38000 0x4000>, <0x100e000 0x1000>;

		interrupts = <133 2 0 0>;

	};

	bman-portal@3c000 {

		compatible = "fsl,bman-portal";

		reg = <0x3c000 0x4000>, <0x100f000 0x1000>;

		interrupts = <135 2 0 0>;

	};

	bman-portal@40000 {

		compatible = "fsl,bman-portal";

		reg = <0x40000 0x4000>, <0x1010000 0x1000>;

		interrupts = <137 2 0 0>;

	};

	bman-portal@44000 {

		compatible = "fsl,bman-portal";

		reg = <0x44000 0x4000>, <0x1011000 0x1000>;

		interrupts = <139 2 0 0>;

	};

	bman-portal@48000 {

		compatible = "fsl,bman-portal";

		reg = <0x48000 0x4000>, <0x1012000 0x1000>;

		interrupts = <141 2 0 0>;

	};

	bman-portal@4c000 {

		compatible = "fsl,bman-portal";

		reg = <0x4c000 0x4000>, <0x1013000 0x1000>;

		interrupts = <143 2 0 0>;

	};

	bman-portal@50000 {

		compatible = "fsl,bman-portal";

		reg = <0x50000 0x4000>, <0x1014000 0x1000>;

		interrupts = <145 2 0 0>;

	};

	bman-portal@54000 {

		compatible = "fsl,bman-portal";

		reg = <0x54000 0x4000>, <0x1015000 0x1000>;

		interrupts = <147 2 0 0>;

	};

	bman-portal@58000 {

		compatible = "fsl,bman-portal";

		reg = <0x58000 0x4000>, <0x1016000 0x1000>;

		interrupts = <149 2 0 0>;

	};

	bman-portal@5c000 {

		compatible = "fsl,bman-portal";

		reg = <0x5c000 0x4000>, <0x1017000 0x1000>;

		interrupts = <151 2 0 0>;

	};

	bman-portal@60000 {

		compatible = "fsl,bman-portal";

		reg = <0x60000 0x4000>, <0x1018000 0x1000>;

		interrupts = <153 2 0 0>;

	};

};



&soc {

	ddr2: memory-controller@9000 {

		compatible = "fsl,qoriq-memory-controller-v4.5", "fsl,qoriq-memory-controller";

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

+88 −1
Original line number Diff line number Diff line 
/*

 * B4420 Silicon/SoC Device Tree Source (post include)

 *

 * Copyright 2012 Freescale Semiconductor, Inc.

 * Copyright 2012 - 2014 Freescale Semiconductor, Inc.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are met:
@@ -32,6 +32,11 @@ 
 * this software, even if advised of the possibility of such damage.

 */



&bman_fbpr {

	compatible = "fsl,bman-fbpr";

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

};



&ifc {

	#address-cells = <2>;

	#size-cells = <1>;
@@ -128,6 +133,83 @@ 
	};

};



&bportals {

	#address-cells = <0x1>;

	#size-cells = <0x1>;

	compatible = "simple-bus";



	bman-portal@0 {

		compatible = "fsl,bman-portal";

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

		interrupts = <105 2 0 0>;

	};

	bman-portal@4000 {

		compatible = "fsl,bman-portal";

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

		interrupts = <107 2 0 0>;

	};

	bman-portal@8000 {

		compatible = "fsl,bman-portal";

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

		interrupts = <109 2 0 0>;

	};

	bman-portal@c000 {

		compatible = "fsl,bman-portal";

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

		interrupts = <111 2 0 0>;

	};

	bman-portal@10000 {

		compatible = "fsl,bman-portal";

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

		interrupts = <113 2 0 0>;

	};

	bman-portal@14000 {

		compatible = "fsl,bman-portal";

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

		interrupts = <115 2 0 0>;

	};

	bman-portal@18000 {

		compatible = "fsl,bman-portal";

		reg = <0x18000 0x4000>, <0x1006000 0x1000>;

		interrupts = <117 2 0 0>;

	};

	bman-portal@1c000 {

		compatible = "fsl,bman-portal";

		reg = <0x1c000 0x4000>, <0x1007000 0x1000>;

		interrupts = <119 2 0 0>;

	};

	bman-portal@20000 {

		compatible = "fsl,bman-portal";

		reg = <0x20000 0x4000>, <0x1008000 0x1000>;

		interrupts = <121 2 0 0>;

	};

	bman-portal@24000 {

		compatible = "fsl,bman-portal";

		reg = <0x24000 0x4000>, <0x1009000 0x1000>;

		interrupts = <123 2 0 0>;

	};

	bman-portal@28000 {

		compatible = "fsl,bman-portal";

		reg = <0x28000 0x4000>, <0x100a000 0x1000>;

		interrupts = <125 2 0 0>;

	};

	bman-portal@2c000 {

		compatible = "fsl,bman-portal";

		reg = <0x2c000 0x4000>, <0x100b000 0x1000>;

		interrupts = <127 2 0 0>;

	};

	bman-portal@30000 {

		compatible = "fsl,bman-portal";

		reg = <0x30000 0x4000>, <0x100c000 0x1000>;

		interrupts = <129 2 0 0>;

	};

	bman-portal@34000 {

		compatible = "fsl,bman-portal";

		reg = <0x34000 0x4000>, <0x100d000 0x1000>;

		interrupts = <131 2 0 0>;

	};

};



&soc {

	#address-cells = <1>;

	#size-cells = <1>;
@@ -261,6 +343,11 @@ 
/include/ "qoriq-duart-1.dtsi"

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



/include/ "qoriq-bman1.dtsi"

	bman: bman@31a000 {

		interrupts = <16 2 1 29>;

	};



	L2: l2-cache-controller@c20000 {

		compatible = "fsl,b4-l2-cache-controller";

		reg = <0xc20000 0x1000>;

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

+36 −1
Original line number Diff line number Diff line 
/*

 * P1023/P1017 Silicon/SoC Device Tree Source (post include)

 *

 * Copyright 2011 Freescale Semiconductor Inc.

 * Copyright 2011 - 2014 Freescale Semiconductor Inc.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are met:
@@ -32,6 +32,11 @@ 
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



&bman_fbpr {

	compatible = "fsl,bman-fbpr";

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

};



&lbc {

	#address-cells = <2>;

	#size-cells = <1>;
@@ -97,6 +102,28 @@ 
	};

};



&bportals {

	#address-cells = <1>;

	#size-cells = <1>;

	compatible = "simple-bus";



	bman-portal@0 {

		compatible = "fsl,bman-portal";

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

		interrupts = <30 2 0 0>;

	};

	bman-portal@4000 {

		compatible = "fsl,bman-portal";

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

		interrupts = <32 2 0 0>;

	};

	bman-portal@8000 {

		compatible = "fsl,bman-portal";

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

		interrupts = <34 2 0 0>;

	};

};



&soc {

	#address-cells = <1>;

	#size-cells = <1>;
@@ -221,6 +248,14 @@ 
/include/ "pq3-mpic.dtsi"

/include/ "pq3-mpic-timer-B.dtsi"



	bman: bman@8a000 {

		compatible = "fsl,bman";

		reg = <0x8a000 0x1000>;

		interrupts = <16 2 0 0>;

		fsl,bman-portals = <&bportals>;

		memory-region = <&bman_fbpr>;

	};



	global-utilities@e0000 {

		compatible = "fsl,p1023-guts";

		reg = <0xe0000 0x1000>;