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: (72 commits)
  powerpc/pseries: Fix build of topology stuff without CONFIG_NUMA
  powerpc/pseries: Fix VPHN build errors on non-SMP systems
  powerpc/83xx: add mpc8308_p1m DMA controller device-tree node
  powerpc/83xx: add DMA controller to mpc8308 device-tree node
  powerpc/512x: try to free dma descriptors in case of allocation failure
  powerpc/512x: add MPC8308 dma support
  powerpc/512x: fix the hanged dma transfer issue
  powerpc/512x: scatter/gather dma fix
  powerpc/powermac: Make auto-loading of therm_pm72 possible
  of/address: Use propper endianess in get_flags
  powerpc/pci: Use printf extension %pR for struct resource
  powerpc: Remove unnecessary casts of void ptr
  powerpc: Disable VPHN polling during a suspend operation
  powerpc/pseries: Poll VPA for topology changes and update NUMA maps
  powerpc: iommu: Add device name to iommu error printks
  powerpc: Record vma->phys_addr in ioremap()
  powerpc: Update compat_arch_ptrace
  powerpc: Fix PPC_PTRACE_SETHWDEBUG on PPC_BOOK3S
  powerpc/time: printk time stamp init not correct
  powerpc: Minor cleanups for machdep.h
  ...

diff --combined Documentation/kernel-parameters.txt
index f3dc951e949f04255d90f35b5da4b78c7d015a67,e51fbd88661dcc224ebbb954a2730e33ceac7c9a..ed3708f8d0dbae4ec5ad73bd3056aeda1c06b73d
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -403,6 -403,10 +403,10 @@@ and is between 256 and 4096 characters
        bttv.pll=       See Documentation/video4linux/bttv/Insmod-options
        bttv.tuner=     and Documentation/video4linux/bttv/CARDLIST
  
+       bulk_remove=off [PPC]  This parameter disables the use of the pSeries
+                       firmware feature for flushing multiple hpte entries
+                       at a time.
+ 
        c101=           [NET] Moxa C101 synchronous serial card
  
        cachesize=      [BUGS=X86-32] Override level 2 CPU cache size detection.
@@@ -1490,6 -1494,10 +1494,10 @@@
        mtdparts=       [MTD]
                        See drivers/mtd/cmdlinepart.c.
  
+       multitce=off    [PPC]  This parameter disables the use of the pSeries
+                       firmware feature for updating multiple TCE entries
+                       at a time.
+ 
        onenand.bdry=   [HW,MTD] Flex-OneNAND Boundary Configuration
  
                        Format: [die0_boundary][,die0_lock][,die1_boundary][,die1_lock]
@@@ -1579,12 -1587,20 +1587,12 @@@
  
        nmi_watchdog=   [KNL,BUGS=X86] Debugging features for SMP kernels
                        Format: [panic,][num]
 -                      Valid num: 0,1,2
 +                      Valid num: 0
                        0 - turn nmi_watchdog off
 -                      1 - use the IO-APIC timer for the NMI watchdog
 -                      2 - use the local APIC for the NMI watchdog using
 -                      a performance counter. Note: This will use one
 -                      performance counter and the local APIC's performance
 -                      vector.
                        When panic is specified, panic when an NMI watchdog
                        timeout occurs.
                        This is useful when you use a panic=... timeout and
                        need the box quickly up again.
 -                      Instead of 1 and 2 it is possible to use the following
 -                      symbolic names: lapic and ioapic
 -                      Example: nmi_watchdog=2 or nmi_watchdog=panic,lapic
  
        netpoll.carrier_timeout=
                        [NET] Specifies amount of time (in seconds) that
@@@ -1614,8 -1630,6 +1622,8 @@@
        noapic          [SMP,APIC] Tells the kernel to not make use of any
                        IOAPICs that may be present in the system.
  
 +      noautogroup     Disable scheduler automatic task group creation.
 +
        nobats          [PPC] Do not use BATs for mapping kernel lowmem
                        on "Classic" PPC cores.
  
@@@ -1753,7 -1767,7 +1761,7 @@@
  
        nousb           [USB] Disable the USB subsystem
  
 -      nowatchdog      [KNL] Disable the lockup detector.
 +      nowatchdog      [KNL] Disable the lockup detector (NMI watchdog).
  
        nowb            [ARM]
  
@@@ -2461,13 -2475,12 +2469,13 @@@
                        to facilitate early boot debugging.
                        See also Documentation/trace/events.txt
  
 -      tsc=            Disable clocksource-must-verify flag for TSC.
 +      tsc=            Disable clocksource stability checks for TSC.
                        Format: <string>
                        [x86] reliable: mark tsc clocksource as reliable, this
 -                      disables clocksource verification at runtime.
 -                      Used to enable high-resolution timer mode on older
 -                      hardware, and in virtualized environment.
 +                      disables clocksource verification at runtime, as well
 +                      as the stability checks done at bootup. Used to enable
 +                      high-resolution timer mode on older hardware, and in
 +                      virtualized environment.
                        [x86] noirqtime: Do not use TSC to do irq accounting.
                        Used to run time disable IRQ_TIME_ACCOUNTING on any
                        platforms where RDTSC is slow and this accounting

diff --combined arch/powerpc/Kconfig
index 48fb4790bfec286f616e75a91129a185cc391162,e16b4988f825394a18638ad60743acddc4590173..959f38ccb9a77fecae6656b41ed1e218df9bb0a5
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -20,6 -20,9 +20,9 @@@ config WORD_SIZ
  config ARCH_PHYS_ADDR_T_64BIT
         def_bool PPC64 || PHYS_64BIT
  
+ config ARCH_DMA_ADDR_T_64BIT
+       def_bool ARCH_PHYS_ADDR_T_64BIT
+ 
  config MMU
        bool
        default y
@@@ -116,7 -119,7 +119,7 @@@ config PP
        bool
        default y
        select OF
 -      select OF_FLATTREE
 +      select OF_EARLY_FLATTREE
        select HAVE_FTRACE_MCOUNT_RECORD
        select HAVE_DYNAMIC_FTRACE
        select HAVE_FUNCTION_TRACER
@@@ -209,7 -212,7 +212,7 @@@ config ARCH_HIBERNATION_POSSIBL
  config ARCH_SUSPEND_POSSIBLE
        def_bool y
        depends on ADB_PMU || PPC_EFIKA || PPC_LITE5200 || PPC_83xx || \
-                  PPC_85xx || PPC_86xx || PPC_PSERIES
+                  PPC_85xx || PPC_86xx || PPC_PSERIES || 44x || 40x
  
  config PPC_DCR_NATIVE
        bool
@@@ -595,13 -598,11 +598,11 @@@ config EXTRA_TARGET
  
          If unsure, leave blank
  
- if !44x || BROKEN
  config ARCH_WANTS_FREEZER_CONTROL
        def_bool y
        depends on ADB_PMU
  
  source kernel/power/Kconfig
- endif
  
  config SECCOMP
        bool "Enable seccomp to safely compute untrusted bytecode"
@@@ -682,6 -683,15 +683,15 @@@ config FSL_PM
          Freescale MPC85xx/MPC86xx power management controller support
          (suspend/resume). For MPC83xx see platforms/83xx/suspend.c
  
+ config PPC4xx_CPM
+       bool
+       default y
+       depends on SUSPEND && (44x || 40x)
+       help
+         PPC4xx Clock Power Management (CPM) support (suspend/resume).
+         It also enables support for two different idle states (idle-wait
+         and idle-doze).
+ 
  config 4xx_SOC
        bool
  

diff --combined arch/powerpc/sysdev/tsi108_dev.c
index c2d675b6392cb0b050eb82c16b74a46dd6aa4a90,5e249a85c1c00f684411676084bbe2856e9f6e58..ee056807b52c027674e04438721abd42fce0feb4
--- 1/arch/powerpc/sysdev/tsi108_dev.c
--- 2/arch/powerpc/sysdev/tsi108_dev.c
+++ b/arch/powerpc/sysdev/tsi108_dev.c
@@@ -19,7 -19,6 +19,7 @@@
  #include <linux/module.h>
  #include <linux/device.h>
  #include <linux/platform_device.h>
 +#include <linux/of_net.h>
  #include <asm/tsi108.h>
  
  #include <asm/system.h>
@@@ -84,8 -83,8 +84,8 @@@ static int __init tsi108_eth_of_init(vo
                memset(&tsi_eth_data, 0, sizeof(tsi_eth_data));
  
                ret = of_address_to_resource(np, 0, &r[0]);
-               DBG("%s: name:start->end = %s:0x%lx-> 0x%lx\n",
-                       __func__,r[0].name, r[0].start, r[0].end);
+               DBG("%s: name:start->end = %s:%pR\n",
+                   __func__, r[0].name, &r[0]);
                if (ret)
                        goto err;
  
@@@ -93,8 -92,8 +93,8 @@@
                r[1].start = irq_of_parse_and_map(np, 0);
                r[1].end = irq_of_parse_and_map(np, 0);
                r[1].flags = IORESOURCE_IRQ;
-               DBG("%s: name:start->end = %s:0x%lx-> 0x%lx\n",
-                       __func__,r[1].name, r[1].start, r[1].end);
+               DBG("%s: name:start->end = %s:%pR\n",
+                       __func__, r[1].name, &r[1]);
  
                tsi_eth_dev =
                    platform_device_register_simple("tsi-ethernet", i++, &r[0],