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

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (408 commits)
  [POWERPC] Add memchr() to the bootwrapper
  [POWERPC] Implement logging of unhandled signals
  [POWERPC] Add legacy serial support for OPB with flattened device tree
  [POWERPC] Use 1TB segments
  [POWERPC] XilinxFB: Allow fixed framebuffer base address
  [POWERPC] XilinxFB: Add support for custom screen resolution
  [POWERPC] XilinxFB: Use pdata to pass around framebuffer parameters
  [POWERPC] PCI: Add 64-bit physical address support to setup_indirect_pci
  [POWERPC] 4xx: Kilauea defconfig file
  [POWERPC] 4xx: Kilauea DTS
  [POWERPC] 4xx: Add AMCC Kilauea eval board support to platforms/40x
  [POWERPC] 4xx: Add AMCC 405EX support to cputable.c
  [POWERPC] Adjust TASK_SIZE on ppc32 systems to 3GB that are capable
  [POWERPC] Use PAGE_OFFSET to tell if an address is user/kernel in SW TLB handlers
  [POWERPC] 85xx: Enable FP emulation in MPC8560 ADS defconfig
  [POWERPC] 85xx: Killed <asm/mpc85xx.h>
  [POWERPC] 85xx: Add cpm nodes for 8541/8555 CDS
  [POWERPC] 85xx: Convert mpc8560ads to the new CPM binding.
  [POWERPC] mpc8272ads: Remove muram from the CPM reg property.
  [POWERPC] Make clockevents work on PPC601 processors
  ...

Fixed up conflict in Documentation/powerpc/booting-without-of.txt manually.

1 files changed, 31 insertions, 0 deletions

diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index 22acece95b11..464f9b4b3169 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -124,6 +124,16 @@ config IRQSTACKS
           for handling hard and soft interrupts.  This can help avoid
           overflowing the process kernel stacks.
 
+config VIRQ_DEBUG
+        bool "Expose hardware/virtual IRQ mapping via debugfs"
+        depends on DEBUG_FS && PPC_MERGE
+        help
+          This option will show the mapping relationship between hardware irq
+          numbers and virtual irq numbers. The mapping is exposed via debugfs
+          in the file powerpc/virq_mapping.
+
+          If you don't know what this means you don't need it.
+
 config BDI_SWITCH
         bool "Include BDI-2000 user context switcher"
         depends on DEBUG_KERNEL && PPC32
@@ -211,6 +221,15 @@ config PPC_EARLY_DEBUG_44x
           Select this to enable early debugging for IBM 44x chips via the
           inbuilt serial port.
 
+config PPC_EARLY_DEBUG_CPM
+        bool "Early serial debugging for Freescale CPM-based serial ports"
+        depends on SERIAL_CPM
+        select PIN_TLB if PPC_8xx
+        help
+          Select this to enable early debugging for Freescale chips
+          using a CPM-based serial port.  This assumes that the bootwrapper
+          has run, and set up the CPM in a particular way.
+
 endchoice
 
 config PPC_EARLY_DEBUG_44x_PHYSLOW
@@ -223,4 +242,16 @@ config PPC_EARLY_DEBUG_44x_PHYSHIGH
         depends PPC_EARLY_DEBUG_44x
         default "0x1"
 
+config PPC_EARLY_DEBUG_CPM_ADDR
+        hex "CPM UART early debug transmit descriptor address"
+        depends on PPC_EARLY_DEBUG_CPM
+        default "0xfa202008" if PPC_EP88XC
+        default "0xf0000008" if CPM2
+        default "0xff002008" if CPM1
+        help
+          This specifies the address of the transmit descriptor
+          used for early debug output.  Because it is needed before
+          platform probing is done, all platforms selected must
+          share the same address.
+
 endmenu