Merge git://www.linux-watchdog.org/linux-watchdog

Pull watchdog updates from Wim Van Sebroeck:
 "This contains:
   - addition of the Intel MID watchdog
   - removal of W83697HF and W83697UG drivers (code was merged into
     w83627hf_wdt driver)
   - addition of Armada 375/380 SoC support
   - conversion of imx2_wdt to regmap API and to watchdog core API
   - lots of other small improvements and fixes"

[ Wim was also tagged by gmail as a spammer, but not delayed by days
  unlike Ben ]

* git://www.linux-watchdog.org/linux-watchdog: (25 commits)
  x86: intel-mid: add watchdog platform code for Merrifield
  watchdog: add Intel MID watchdog driver support
  watchdog: sp805: Set watchdog_device->timeout from ->set_timeout()
  booke/watchdog: refine and clean up the codes
  watchdog: iop_wdt only builds for mach-iop13xx
  watchdog: Remove drivers for W83697HF and W83697UG
  watchdog: w83627hf_wdt: Add early_disable module parameter
  ARM: mvebu: Add A375/A380 watchdog binding documentation
  watchdog: orion: Add Armada 375/380 SoC support
  watchdog: orion: Introduce per-SoC enabled() function
  watchdog: orion: Introduce per-SoC stop() function
  watchdog: orion: Remove unneeded atomic access
  watchdog: orion: Introduce a SoC-specific RSTOUT mapping
  watchdog: orion: Move the register ioremap'ing to its own function
  watchdog: xilinx: Make of_device_id array const
  watchdog: imx2_wdt: convert to watchdog core api
  watchdog: imx2_wdt: convert to use regmap API.
  watchdog: imx2_wdt: Sort the header files alphabetically
  watchdog: ath79_wdt: switch to clk_prepare/clk_disable
  watchdog: ath79_wdt: avoid spurious restarts on AR934x
  ...

diff --combined arch/powerpc/kernel/setup-common.c
index aa0f5ed,fb87e4a..d4d4183
--- 1/arch/powerpc/kernel/setup-common.c
--- 2/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@@ -212,7 -212,6 +212,7 @@@ static int show_cpuinfo(struct seq_fil
  {
        unsigned long cpu_id = (unsigned long)v - 1;
        unsigned int pvr;
 +      unsigned long proc_freq;
        unsigned short maj;
        unsigned short min;
  
@@@ -264,19 -263,12 +264,19 @@@
  #endif /* CONFIG_TAU */
  
        /*
 -       * Assume here that all clock rates are the same in a
 -       * smp system.  -- Cort
 +       * Platforms that have variable clock rates, should implement
 +       * the method ppc_md.get_proc_freq() that reports the clock
 +       * rate of a given cpu. The rest can use ppc_proc_freq to
 +       * report the clock rate that is same across all cpus.
         */
 -      if (ppc_proc_freq)
 +      if (ppc_md.get_proc_freq)
 +              proc_freq = ppc_md.get_proc_freq(cpu_id);
 +      else
 +              proc_freq = ppc_proc_freq;
 +
 +      if (proc_freq)
                seq_printf(m, "clock\t\t: %lu.%06luMHz\n",
 -                         ppc_proc_freq / 1000000, ppc_proc_freq % 1000000);
 +                         proc_freq / 1000000, proc_freq % 1000000);
  
        if (ppc_md.show_percpuinfo != NULL)
                ppc_md.show_percpuinfo(m, cpu_id);
@@@ -390,10 -382,9 +390,10 @@@ void __init check_for_initrd(void
  
  #ifdef CONFIG_SMP
  
 -int threads_per_core, threads_shift;
 +int threads_per_core, threads_per_subcore, threads_shift;
  cpumask_t threads_core_mask;
  EXPORT_SYMBOL_GPL(threads_per_core);
 +EXPORT_SYMBOL_GPL(threads_per_subcore);
  EXPORT_SYMBOL_GPL(threads_shift);
  EXPORT_SYMBOL_GPL(threads_core_mask);
  
@@@ -402,7 -393,6 +402,7 @@@ static void __init cpu_init_thread_core
        int i;
  
        threads_per_core = tpc;
 +      threads_per_subcore = tpc;
        cpumask_clear(&threads_core_mask);
  
        /* This implementation only supports power of 2 number of threads
@@@ -728,33 -718,6 +728,6 @@@ static int powerpc_debugfs_init(void
  arch_initcall(powerpc_debugfs_init);
  #endif
  
- #ifdef CONFIG_BOOKE_WDT
- extern u32 booke_wdt_enabled;
- extern u32 booke_wdt_period;
- 
- /* Checks wdt=x and wdt_period=xx command-line option */
- notrace int __init early_parse_wdt(char *p)
- {
-       if (p && strncmp(p, "0", 1) != 0)
-               booke_wdt_enabled = 1;
- 
-       return 0;
- }
- early_param("wdt", early_parse_wdt);
- 
- int __init early_parse_wdt_period(char *p)
- {
-       unsigned long ret;
-       if (p) {
-               if (!kstrtol(p, 0, &ret))
-                       booke_wdt_period = ret;
-       }
- 
-       return 0;
- }
- early_param("wdt_period", early_parse_wdt_period);
- #endif        /* CONFIG_BOOKE_WDT */
- 
  void ppc_printk_progress(char *s, unsigned short hex)
  {
        pr_info("%s\n", s);