Commit 2f29e3a5 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge remote-tracking branch 'scott/next' into next 

Highlights include corenet board file consolidation, the ability to run
userspaces with lwsync on e500v1/v2, some cleanup patches that other KVM
patches will build on, support for stripped-down e6500 emulation targets,
and some fixes of minor longstanding issues.
parents bcd77ffc a3821b2a

arch/powerpc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ config FA_DUMP 


config IRQ_ALL_CPUS

	bool "Distribute interrupts on all CPUs by default"

	depends on SMP && !MV64360

	depends on SMP

	help

	  This option gives the kernel permission to distribute IRQs across

	  multiple CPUs.  Saying N here will route all IRQs to the first

arch/powerpc/boot/dts/b4860emu.dts

0 → 100644
+218 −0
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>;

		};

		cpu1: PowerPC,e6500@2 {

			device_type = "cpu";

			reg = <2 3>;

			next-level-cache = <&L2>;

		};

		cpu2: PowerPC,e6500@4 {

			device_type = "cpu";

			reg = <4 5>;

			next-level-cache = <&L2>;

		};

		cpu3: PowerPC,e6500@6 {

			device_type = "cpu";

			reg = <6 7>;

			next-level-cache = <&L2>;

		};

	};

};



/ {

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

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

	};



	clockgen: global-utilities@e1000 {

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

		reg = <0xe1000 0x1000>;

	};



/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

+32 −19
Original line number Diff line number Diff line
@@ -120,6 +120,17 @@ sdhc@114000 { 
		};



		i2c@118000 {

			mux@77 {

				compatible = "nxp,pca9547";

				reg = <0x77>;

				#address-cells = <1>;

				#size-cells = <0>;



				i2c@0 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <0>;



					eeprom@50 {

						compatible = "at24,24c64";

						reg = <0x50>;
@@ -141,6 +152,8 @@ rtc@68 { 
						reg = <0x68>;

					};

				};

			};

		};



		usb@210000 {

			dr_mode = "host";

arch/powerpc/boot/dts/c293pcie.dts

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ memory { 
	ifc: ifc@fffe1e000 {

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

		ranges = <0x0 0x0 0xf 0xec000000 0x04000000

			  0x1 0x0 0xf 0xff800000 0x00010000

			  0x2 0x0 0xf 0xffdf0000 0x00010000>;



	};

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

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ 


/dts-v1/;



/include/ "e6500_power_isa.dtsi"



/ {

	compatible = "fsl,B4420";

	#address-cells = <2>;