Commit 44d84afa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (28 commits)
  powerpc: Fix oops when loading modules
  powerpc: Wire up preadv and pwritev
  powerpc/ftrace: Fix printf format warning
  powerpc/ftrace: Fix #if that should be #ifdef
  powerpc: Fix ptrace compat wrapper for FPU register access
  powerpc: Print information about mapping hw irqs to virtual irqs
  powerpc: Correct dependency of KEXEC
  powerpc: Disable VSX or current process in giveup_fpu/altivec
  powerpc/pseries: Enable relay in pseries_defconfig
  powerpc/pseries: Fix ibm,client-architecture comment
  powerpc/pseries: Scan for all events in rtasd
  powerpc/pseries: Add dispatch dispersion statistics
  powerpc: Clean up some prom printouts
  powerpc: Print progress of ibm,client-architecture method
  powerpc: Remove duplicated #include's
  powerpc/pmac: Fix internal modem IRQ on Wallstreet PowerBook
  powerpc/wdrtas: Update wdrtas_get_interval to use rtas_data_buf
  fsl-diu-fb: Pass the proper device for dma mapping routines
  powerpc/pq2fads: Update device tree for use with device-tree-aware u-boot.
  cpm_uart: Disable CPM udbg when re-initing CPM uart, even if not the console.
  ...
parents f8201abc 11b55da7

arch/powerpc/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE 


config KEXEC

	bool "kexec system call (EXPERIMENTAL)"

	depends on BOOK3S && EXPERIMENTAL

	depends on PPC_BOOK3S && EXPERIMENTAL

	help

	  kexec is a system call that implements the ability to shutdown your

	  current kernel, and to start another kernel.  It is like a reboot
@@ -775,6 +775,7 @@ config LOWMEM_CAM_NUM_BOOL 
	  Say N here unless you know what you are doing.



config LOWMEM_CAM_NUM

	depends on FSL_BOOKE

	int "Number of CAMs to use to map low memory" if LOWMEM_CAM_NUM_BOOL

	default 3

arch/powerpc/boot/dts/ksi8560.dts

+2 −2
Original line number Diff line number Diff line
@@ -57,14 +57,14 @@ 
		bus-frequency = <0>;				/* Fixed by bootwrapper */



		memory-controller@2000 {

			compatible = "fsl,8540-memory-controller";

			compatible = "fsl,mpc8540-memory-controller";

			reg = <0x2000 0x1000>;

			interrupt-parent = <&mpic>;

			interrupts = <0x12 0x2>;

		};



		L2: l2-cache-controller@20000 {

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

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

			reg = <0x20000 0x1000>;

			cache-line-size = <0x20>;		/* 32 bytes */

			cache-size = <0x40000>;			/* L2, 256K */

arch/powerpc/boot/dts/pq2fads.dts

+14 −6
Original line number Diff line number Diff line
@@ -17,6 +17,14 @@ 
	#address-cells = <1>;

	#size-cells = <1>;



	aliases {

		ethernet0 = &enet0;

		ethernet1 = &enet1;

		serial0 = &serial0;

		serial1 = &serial1;

		pci0 = &pci0;

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;
@@ -45,7 +53,7 @@ 
		#size-cells = <1>;

		reg = <0xf0010100 0x60>;



		ranges = <0x0 0x0 0xfe000000 0x800000

		ranges = <0x0 0x0 0xff800000 0x800000

		          0x1 0x0 0xf4500000 0x8000

		          0x8 0x0 0xf8200000 0x8000>;
@@ -71,7 +79,7 @@ 
		};

	};



	pci@f0010800 {

	pci0: pci@f0010800 {

		device_type = "pci";

		reg = <0xf0010800 0x10c 0xf00101ac 0x8 0xf00101c4 0x8>;

		compatible = "fsl,mpc8280-pci", "fsl,pq2-pci";
@@ -142,7 +150,7 @@ 
				reg = <0x119f0 0x10 0x115f0 0x10>;

			};



			serial@11a00 {

			serial0: serial@11a00 {

				device_type = "serial";

				compatible = "fsl,mpc8280-scc-uart",

				             "fsl,cpm2-scc-uart";
@@ -153,7 +161,7 @@ 
				fsl,cpm-command = <0x800000>;

			};



			serial@11a20 {

			serial1: serial@11a20 {

				device_type = "serial";

				compatible = "fsl,mpc8280-scc-uart",

				             "fsl,cpm2-scc-uart";
@@ -164,7 +172,7 @@ 
				fsl,cpm-command = <0x4a00000>;

			};



			ethernet@11320 {

			enet0: ethernet@11320 {

				device_type = "network";

				compatible = "fsl,mpc8280-fcc-enet",

				             "fsl,cpm2-fcc-enet";
@@ -176,7 +184,7 @@ 
				fsl,cpm-command = <0x16200300>;

			};



			ethernet@11340 {

			enet1: ethernet@11340 {

				device_type = "network";

				compatible = "fsl,mpc8280-fcc-enet",

				             "fsl,cpm2-fcc-enet";

arch/powerpc/boot/dts/sbc8548.dts

+2 −2
Original line number Diff line number Diff line
@@ -156,14 +156,14 @@ 
		compatible = "simple-bus";



		memory-controller@2000 {

			compatible = "fsl,8548-memory-controller";

			compatible = "fsl,mpc8548-memory-controller";

			reg = <0x2000 0x1000>;

			interrupt-parent = <&mpic>;

			interrupts = <0x12 0x2>;

		};



		L2: l2-cache-controller@20000 {

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

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

			reg = <0x20000 0x1000>;

			cache-line-size = <0x20>;	// 32 bytes

			cache-size = <0x80000>;	// L2, 512K

arch/powerpc/boot/dts/sbc8560.dts

+2 −2
Original line number Diff line number Diff line
@@ -61,14 +61,14 @@ 
		clock-frequency = <0>;



		memory-controller@2000 {

			compatible = "fsl,8560-memory-controller";

			compatible = "fsl,mpc8560-memory-controller";

			reg = <0x2000 0x1000>;

			interrupt-parent = <&mpic>;

			interrupts = <0x12 0x2>;

		};



		L2: l2-cache-controller@20000 {

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

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

			reg = <0x20000 0x1000>;

			cache-line-size = <0x20>;	// 32 bytes

			cache-size = <0x40000>;		// L2, 256K

CRA Git | Maintained and supported by SUSTech CRA and CCSE