Commit 85da1fb5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (53 commits)
  serial: Add driver for the Cell Network Processor serial port NWP device
  powerpc: enable dynamic ftrace
  powerpc/cell: Fix the prototype of create_vma_map()
  powerpc/mm: Make clear_fixmap() actually work
  powerpc/kdump: Use ppc_save_regs() in crash_setup_regs()
  powerpc: Export cacheable_memzero as its now used in a driver
  powerpc: Fix missing semicolons in mmu_decl.h
  powerpc/pasemi: local_irq_save uses an unsigned long
  powerpc/cell: Fix some u64 vs. long types
  powerpc/cell: Use correct types in beat files
  powerpc: Use correct type in prom_init.c
  powerpc: Remove unnecessary casts
  mtd/ps3vram: Use _PAGE_NO_CACHE in memory ioremap
  mtd/ps3vram: Use msleep in waits
  mtd/ps3vram: Use proper kernel types
  mtd/ps3vram: Cleanup ps3vram driver messages
  mtd/ps3vram: Remove ps3vram debug routines
  mtd/ps3vram: Add modalias support to the ps3vram driver
  mtd/ps3vram: Add ps3vram driver for accessing video RAM as MTD
  powerpc: Fix iseries drivers build failure without CONFIG_VIOPATH
  ...
parents 73ac36ea 5886188d

Documentation/powerpc/dts-bindings/fsl/board.txt

+31 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ This is the memory-mapped registers for on board FPGA. 


Required properities:

- compatible : should be "fsl,fpga-pixis".

- reg : should contain the address and the lenght of the FPPGA register

- reg : should contain the address and the length of the FPPGA register

  set.



Example (MPC8610HPCD):
@@ -27,3 +27,33 @@ Example (MPC8610HPCD): 
		compatible = "fsl,fpga-pixis";

		reg = <0xe8000000 32>;

	};



* Freescale BCSR GPIO banks



Some BCSR registers act as simple GPIO controllers, each such

register can be represented by the gpio-controller node.



Required properities:

- compatible : Should be "fsl,<board>-bcsr-gpio".

- reg : Should contain the address and the length of the GPIO bank

  register.

- #gpio-cells : Should be two. The first cell is the pin number and the

  second cell is used to specify optional paramters (currently unused).

- gpio-controller : Marks the port as GPIO controller.



Example:



	bcsr@1,0 {

		#address-cells = <1>;

		#size-cells = <1>;

		compatible = "fsl,mpc8360mds-bcsr";

		reg = <1 0 0x8000>;

		ranges = <0 1 0 0x8000>;



		bcsr13: gpio-controller@d {

			#gpio-cells = <2>;

			compatible = "fsl,mpc8360mds-bcsr-gpio";

			reg = <0xd 1>;

			gpio-controller;

		};

	};

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -3489,6 +3489,12 @@ L: linuxppc-dev@ozlabs.org 
L:	cbe-oss-dev@ozlabs.org

S:	Supported



PS3VRAM DRIVER

P:	Jim Paris

M:	jim@jtan.com

L:	cbe-oss-dev@ozlabs.org

S:	Maintained



PVRUSB2 VIDEO4LINUX DRIVER

P:	Mike Isely

M:	isely@pobox.com

arch/powerpc/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@ config ARCH_NO_VIRT_TO_BUS 
config PPC

	bool

	default y

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_DYNAMIC_FTRACE

	select HAVE_FUNCTION_TRACER

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select HAVE_IDE
@@ -326,7 +328,8 @@ config KEXEC 


config CRASH_DUMP

	bool "Build a kdump crash kernel"

	depends on (PPC64 && RELOCATABLE) || 6xx

	depends on PPC64 || 6xx

	select RELOCATABLE if PPC64

	help

	  Build a kernel suitable for use as a kdump capture kernel.

	  The same kernel binary can be used as production kernel and dump

arch/powerpc/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ $(obj)/zImage.initrd: $(addprefix $(obj)/, $(initrd-y)) 
	@rm -f $@; ln $< $@



install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y))

	sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $<

	sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $^



# anything not in $(targets)

clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \

arch/powerpc/boot/dts/mpc836x_mds.dts

+41 −2
Original line number Diff line number Diff line
@@ -69,8 +69,18 @@ 
		};



		bcsr@1,0 {

			#address-cells = <1>;

			#size-cells = <1>;

 			compatible = "fsl,mpc8360mds-bcsr";

			reg = <1 0 0x8000>;

			ranges = <0 1 0 0x8000>;



			bcsr13: gpio-controller@d {

				#gpio-cells = <2>;

				compatible = "fsl,mpc8360mds-bcsr-gpio";

				reg = <0xd 1>;

				gpio-controller;

			};

		};

	};
@@ -195,10 +205,21 @@ 
		};



		par_io@1400 {

			#address-cells = <1>;

			#size-cells = <1>;

			reg = <0x1400 0x100>;

			ranges = <0 0x1400 0x100>;

			device_type = "par_io";

			num-ports = <7>;



			qe_pio_b: gpio-controller@18 {

				#gpio-cells = <2>;

				compatible = "fsl,mpc8360-qe-pario-bank",

					     "fsl,mpc8323-qe-pario-bank";

				reg = <0x18 0x18>;

				gpio-controller;

			};



			pio1: ucc_pin@01 {

				pio-map = <

			/* port  pin  dir  open_drain  assignment  has_irq */
@@ -282,6 +303,15 @@ 
			};

		};



		timer@440 {

			compatible = "fsl,mpc8360-qe-gtm",

				     "fsl,qe-gtm", "fsl,gtm";

			reg = <0x440 0x40>;

			clock-frequency = <132000000>;

			interrupts = <12 13 14 15>;

			interrupt-parent = <&qeic>;

		};



		spi@4c0 {

			cell-index = <0>;

			compatible = "fsl,spi";
@@ -301,11 +331,20 @@ 
		};



		usb@6c0 {

			compatible = "qe_udc";

			compatible = "fsl,mpc8360-qe-usb",

				     "fsl,mpc8323-qe-usb";

			reg = <0x6c0 0x40 0x8b00 0x100>;

			interrupts = <11>;

			interrupt-parent = <&qeic>;

			mode = "slave";

			fsl,fullspeed-clock = "clk21";

			fsl,lowspeed-clock = "brg9";

			gpios = <&qe_pio_b  2 0   /* USBOE */

				 &qe_pio_b  3 0   /* USBTP */

				 &qe_pio_b  8 0   /* USBTN */

				 &qe_pio_b  9 0   /* USBRP */

				 &qe_pio_b 11 0   /* USBRN */

				 &bcsr13    5 0   /* SPEED */

				 &bcsr13    4 1>; /* POWER */

		};



		enet0: ucc@2000 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE