Commit 0fa21331 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (103 commits)
  powerpc: Fix bug in move of altivec code to vector.S
  powerpc: Add support for swiotlb on 32-bit
  powerpc/spufs: Remove unused error path
  powerpc: Fix warning when printing a resource_size_t
  powerpc/xmon: Remove unused variable in xmon.c
  powerpc/pseries: Fix warnings when printing resource_size_t
  powerpc: Shield code specific to 64-bit server processors
  powerpc: Separate PACA fields for server CPUs
  powerpc: Split exception handling out of head_64.S
  powerpc: Introduce CONFIG_PPC_BOOK3S
  powerpc: Move VMX and VSX asm code to vector.S
  powerpc: Set init_bootmem_done on NUMA platforms as well
  powerpc/mm: Fix a AB->BA deadlock scenario with nohash MMU context lock
  powerpc/mm: Fix some SMP issues with MMU context handling
  powerpc: Add PTRACE_SINGLEBLOCK support
  fbdev: Add PLB support and cleanup DCR in xilinxfb driver.
  powerpc/virtex: Add ml510 reference design device tree
  powerpc/virtex: Add Xilinx ML510 reference design support
  powerpc/virtex: refactor intc driver and add support for i8259 cascading
  powerpc/virtex: Add support for Xilinx PCI host bridge
  ...
parents d3bf80bf bc47ab02

Documentation/kernel-parameters.txt

+7 −0
Original line number Diff line number Diff line
@@ -491,6 +491,13 @@ and is between 256 and 4096 characters. It is defined in the file 
			Also note the kernel might malfunction if you disable

			some critical bits.



	cmo_free_hint=	[PPC] Format: { yes | no }

			Specify whether pages are marked as being inactive

			when they are freed.  This is used in CMO environments

			to determine OS memory pressure for page stealing by

			a hypervisor.

			Default: yes



	code_bytes	[X86] How many bytes of object code to print

			in an oops report.

			Range: 0 - 8192

Documentation/powerpc/dts-bindings/ecm.txt

0 → 100644
+64 −0
Original line number Diff line number Diff line 
=====================================================================

E500 LAW & Coherency Module Device Tree Binding

Copyright (C) 2009 Freescale Semiconductor Inc.

=====================================================================



Local Access Window (LAW) Node



The LAW node represents the region of CCSR space where local access

windows are configured.  For ECM based devices this is the first 4k

of CCSR space that includes CCSRBAR, ALTCBAR, ALTCAR, BPTR, and some

number of local access windows as specified by fsl,num-laws.



PROPERTIES



  - compatible

      Usage: required

      Value type: <string>

      Definition: Must include "fsl,ecm-law"



  - reg

      Usage: required

      Value type: <prop-encoded-array>

      Definition: A standard property.  The value specifies the

          physical address offset and length of the CCSR space

          registers.



  - fsl,num-laws

      Usage: required

      Value type: <u32>

      Definition: The value specifies the number of local access

          windows for this device.



=====================================================================



E500 Coherency Module Node



The E500 LAW node represents the region of CCSR space where ECM config

and error reporting registers exist, this is the second 4k (0x1000)

of CCSR space.



PROPERTIES



  - compatible

      Usage: required

      Value type: <string>

      Definition: Must include "fsl,CHIP-ecm", "fsl,ecm" where

      CHIP is the processor (mpc8572, mpc8544, etc.)



  - reg

      Usage: required

      Value type: <prop-encoded-array>

      Definition: A standard property.  The value specifies the

          physical address offset and length of the CCSR space

          registers.



   - interrupts

      Usage: required

      Value type: <prop-encoded-array>



   - interrupt-parent

      Usage: required

      Value type: <phandle>



=====================================================================

Documentation/powerpc/dts-bindings/fsl/cpm_qe/qe.txt

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ Required properties: 
- model : precise model of the QE, Can be "QE", "CPM", or "CPM2"

- reg : offset and length of the device registers.

- bus-frequency : the clock frequency for QUICC Engine.

- fsl,qe-num-riscs: define how many RISC engines the QE has.

- fsl,qe-num-snums: define how many serial number(SNUM) the QE can use for the

  threads.



Recommended properties

- brg-frequency : the internal clock source frequency for baud-rate

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

+2 −3
Original line number Diff line number Diff line
@@ -5,8 +5,7 @@ for MMC, SD, and SDIO types of memory cards. 


Required properties:

  - compatible : should be

    "fsl,<chip>-esdhc", "fsl,mpc8379-esdhc" for MPC83xx processors.

    "fsl,<chip>-esdhc", "fsl,mpc8536-esdhc" for MPC85xx processors.

    "fsl,<chip>-esdhc", "fsl,esdhc"

  - reg : should contain eSDHC registers location and length.

  - interrupts : should contain eSDHC interrupt.

  - interrupt-parent : interrupt source phandle.
@@ -15,7 +14,7 @@ Required properties: 
Example:



sdhci@2e000 {

	compatible = "fsl,mpc8378-esdhc", "fsl,mpc8379-esdhc";

	compatible = "fsl,mpc8378-esdhc", "fsl,esdhc";

	reg = <0x2e000 0x1000>;

	interrupts = <42 0x8>;

	interrupt-parent = <&ipic>;

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

0 → 100644
+64 −0
Original line number Diff line number Diff line 
=====================================================================

MPX LAW & Coherency Module Device Tree Binding

Copyright (C) 2009 Freescale Semiconductor Inc.

=====================================================================



Local Access Window (LAW) Node



The LAW node represents the region of CCSR space where local access

windows are configured.  For MCM based devices this is the first 4k

of CCSR space that includes CCSRBAR, ALTCBAR, ALTCAR, BPTR, and some

number of local access windows as specified by fsl,num-laws.



PROPERTIES



  - compatible

      Usage: required

      Value type: <string>

      Definition: Must include "fsl,mcm-law"



  - reg

      Usage: required

      Value type: <prop-encoded-array>

      Definition: A standard property.  The value specifies the

          physical address offset and length of the CCSR space

          registers.



  - fsl,num-laws

      Usage: required

      Value type: <u32>

      Definition: The value specifies the number of local access

          windows for this device.



=====================================================================



MPX Coherency Module Node



The MPX LAW node represents the region of CCSR space where MCM config

and error reporting registers exist, this is the second 4k (0x1000)

of CCSR space.



PROPERTIES



  - compatible

      Usage: required

      Value type: <string>

      Definition: Must include "fsl,CHIP-mcm", "fsl,mcm" where

      CHIP is the processor (mpc8641, mpc8610, etc.)



  - reg

      Usage: required

      Value type: <prop-encoded-array>

      Definition: A standard property.  The value specifies the

          physical address offset and length of the CCSR space

          registers.



   - interrupts

      Usage: required

      Value type: <prop-encoded-array>



   - interrupt-parent

      Usage: required

      Value type: <phandle>



=====================================================================

CRA Git | Maintained and supported by SUSTech CRA and CCSE