Merge branches 'clockevents/4.4-fixes' and 'clockevents/4.5-fixes' of http://git...

Pull in fixes from Daniel Lezcano:

 - Fix the vt8500 timer leading to a system lock up when dealing with too
   small delta (Roman Volkov)

 - Select the CLKSRC_MMIO when the fsl_ftm_timer is enabled with COMPILE_TEST
   (Daniel Lezcano)

 - Prevent to compile timers using the 'iomem' API when the architecture has
   not HAS_IOMEM set (Richard Weinberger)

diff --combined MAINTAINERS
index b2f6b0463678d47d347aa92f8f1f07cb4b9fd5b9,233f83464814f138c4c68f0815d2dbeace552ef6..87d1ca7ca56ae7cf9e2366bfb9f35fcbdecfa7e0
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -318,7 -318,7 +318,7 @@@ M: Zhang Rui <rui.zhang@intel.com
  L:    linux-acpi@vger.kernel.org
  W:    https://01.org/linux-acpi
  S:    Supported
- F:    drivers/acpi/video.c
+ F:    drivers/acpi/acpi_video.c
  
  ACPI WMI DRIVER
  L:    platform-driver-x86@vger.kernel.org
@@@ -1847,7 -1847,7 +1847,7 @@@ S:      Supporte
  F:    drivers/net/wireless/ath/ath6kl/
  
  WILOCITY WIL6210 WIRELESS DRIVER
- M:    Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
+ M:    Maya Erez <qca_merez@qca.qualcomm.com>
  L:    linux-wireless@vger.kernel.org
  L:    wil6210@qca.qualcomm.com
  S:    Supported
@@@ -1931,7 -1931,7 +1931,7 @@@ S:      Supporte
  F:    drivers/i2c/busses/i2c-at91.c
  
  ATMEL ISI DRIVER
- M:    Josh Wu <josh.wu@atmel.com>
+ M:    Ludovic Desroches <ludovic.desroches@atmel.com>
  L:    linux-media@vger.kernel.org
  S:    Supported
  F:    drivers/media/platform/soc_camera/atmel-isi.c
@@@ -1950,7 -1950,8 +1950,8 @@@ S:      Supporte
  F:    drivers/net/ethernet/cadence/
  
  ATMEL NAND DRIVER
- M:    Josh Wu <josh.wu@atmel.com>
+ M:    Wenyou Yang <wenyou.yang@atmel.com>
+ M:    Josh Wu <rainyfeeling@outlook.com>
  L:    linux-mtd@lists.infradead.org
  S:    Supported
  F:    drivers/mtd/nand/atmel_nand*
@@@ -2974,6 -2975,7 +2975,7 @@@ F:      kernel/cpuset.
  CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
  M:    Johannes Weiner <hannes@cmpxchg.org>
  M:    Michal Hocko <mhocko@kernel.org>
+ M:    Vladimir Davydov <vdavydov@virtuozzo.com>
  L:    cgroups@vger.kernel.org
  L:    linux-mm@kvack.org
  S:    Maintained
@@@ -5576,7 -5578,7 +5578,7 @@@ R:      Jesse Brandeburg <jesse.brandeburg@i
  R:    Shannon Nelson <shannon.nelson@intel.com>
  R:    Carolyn Wyborny <carolyn.wyborny@intel.com>
  R:    Don Skidmore <donald.c.skidmore@intel.com>
- R:    Matthew Vick <matthew.vick@intel.com>
+ R:    Bruce Allan <bruce.w.allan@intel.com>
  R:    John Ronciak <john.ronciak@intel.com>
  R:    Mitch Williams <mitch.a.williams@intel.com>
  L:    intel-wired-lan@lists.osuosl.org
@@@ -6366,6 -6368,7 +6368,7 @@@ F:      arch/*/include/asm/pmem.
  LIGHTNVM PLATFORM SUPPORT
  M:    Matias Bjorling <mb@lightnvm.io>
  W:    http://github/OpenChannelSSD
+ L:    linux-block@vger.kernel.org
  S:    Maintained
  F:    drivers/lightnvm/
  F:    include/linux/lightnvm.h
@@@ -8284,7 -8287,7 +8287,7 @@@ F:      include/linux/delayacct.
  F:    kernel/delayacct.c
  
  PERFORMANCE EVENTS SUBSYSTEM
- M:    Peter Zijlstra <a.p.zijlstra@chello.nl>
+ M:    Peter Zijlstra <peterz@infradead.org>
  M:    Ingo Molnar <mingo@redhat.com>
  M:    Arnaldo Carvalho de Melo <acme@kernel.org>
  L:    linux-kernel@vger.kernel.org
@@@ -8377,6 -8380,14 +8380,14 @@@ L:    linux-samsung-soc@vger.kernel.org (m
  S:    Maintained
  F:    drivers/pinctrl/samsung/
  
+ PIN CONTROLLER - SINGLE
+ M:    Tony Lindgren <tony@atomide.com>
+ M:    Haojian Zhuang <haojian.zhuang@linaro.org>
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ L:    linux-omap@vger.kernel.org
+ S:    Maintained
+ F:    drivers/pinctrl/pinctrl-single.c
+ 
  PIN CONTROLLER - ST SPEAR
  M:    Viresh Kumar <vireshk@kernel.org>
  L:    spear-devel@list.st.com
@@@ -8943,6 -8954,13 +8954,13 @@@ F:    drivers/rpmsg
  F:    Documentation/rpmsg.txt
  F:    include/linux/rpmsg.h
  
+ RENESAS ETHERNET DRIVERS
+ R:    Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
+ L:    netdev@vger.kernel.org
+ L:    linux-sh@vger.kernel.org
+ F:    drivers/net/ethernet/renesas/
+ F:    include/linux/sh_eth.h
+ 
  RESET CONTROLLER FRAMEWORK
  M:    Philipp Zabel <p.zabel@pengutronix.de>
  S:    Maintained
@@@ -9348,7 -9366,7 +9366,7 @@@ M:      Andreas Noever <andreas.noever@gmail
  S:    Maintained
  F:    drivers/thunderbolt/
  
 -TIMEKEEPING, CLOCKSOURCE CORE, NTP
 +TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
  M:    John Stultz <john.stultz@linaro.org>
  M:    Thomas Gleixner <tglx@linutronix.de>
  L:    linux-kernel@vger.kernel.org
@@@ -9361,7 -9379,6 +9379,7 @@@ F:      include/uapi/linux/time.
  F:    include/uapi/linux/timex.h
  F:    kernel/time/clocksource.c
  F:    kernel/time/time*.c
 +F:    kernel/time/alarmtimer.c
  F:    kernel/time/ntp.c
  F:    tools/testing/selftests/timers/
  
@@@ -9426,8 -9443,10 +9444,10 @@@ F:    include/scsi/sg.
  
  SCSI SUBSYSTEM
  M:    "James E.J. Bottomley" <JBottomley@odin.com>
- L:    linux-scsi@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
+ M:    "Martin K. Petersen" <martin.petersen@oracle.com>
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
+ L:    linux-scsi@vger.kernel.org
  S:    Maintained
  F:    drivers/scsi/
  F:    include/scsi/
@@@ -10902,9 -10921,9 +10922,9 @@@ S:   Maintaine
  F:    drivers/media/tuners/tua9001*
  
  TULIP NETWORK DRIVERS
- M:    Grant Grundler <grundler@parisc-linux.org>
  L:    netdev@vger.kernel.org
- S:    Maintained
+ L:    linux-parisc@vger.kernel.org
+ S:    Orphan
  F:    drivers/net/ethernet/dec/tulip/
  
  TUN/TAP driver

diff --combined arch/arm/Kconfig
index a5d416ec1d014b266f3ab4b328009c2085bcb6ff,34e1569a11ee322a0a020bdfe0c9b801b6b58c12..688dc7b0d95121a95285a998b6f019a4b8f30cf5
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -76,6 -76,8 +76,8 @@@ config AR
        select IRQ_FORCED_THREADING
        select MODULES_USE_ELF_REL
        select NO_BOOTMEM
+       select OF_EARLY_FLATTREE if OF
+       select OF_RESERVED_MEM if OF
        select OLD_SIGACTION
        select OLD_SIGSUSPEND3
        select PERF_USE_VMALLOC
@@@ -609,7 -611,6 +611,7 @@@ config ARCH_PX
        select AUTO_ZRELADDR
        select COMMON_CLK
        select CLKDEV_LOOKUP
 +      select CLKSRC_PXA
        select CLKSRC_MMIO
        select CLKSRC_OF
        select GENERIC_CLOCKEVENTS
@@@ -649,8 -650,6 +651,8 @@@ config ARCH_SA110
        select ARCH_SPARSEMEM_ENABLE
        select CLKDEV_LOOKUP
        select CLKSRC_MMIO
 +      select CLKSRC_PXA
 +      select CLKSRC_OF if OF
        select CPU_FREQ
        select CPU_SA1100
        select GENERIC_CLOCKEVENTS
@@@ -1825,8 -1824,6 +1827,6 @@@ config USE_O
        bool "Flattened Device Tree support"
        select IRQ_DOMAIN
        select OF
-       select OF_EARLY_FLATTREE
-       select OF_RESERVED_MEM
        help
          Include support for flattened device tree machine descriptions.
  

diff --combined drivers/clocksource/vt8500_timer.c
index de49805fbb0978bb2eac2bd019c252604cd6afe2,dfc3bb410b00f23d644755410dbcf9452a8a99e6..ddb409274f45a72a6b3af5289ee1779396523f73
--- 1/drivers/clocksource/vt8500_timer.c
--- 2/drivers/clocksource/vt8500_timer.c
+++ b/drivers/clocksource/vt8500_timer.c
@@@ -30,6 -30,7 +30,6 @@@
  #include <linux/clocksource.h>
  #include <linux/clockchips.h>
  #include <linux/delay.h>
 -#include <asm/mach/time.h>
  
  #include <linux/of.h>
  #include <linux/of_address.h>
@@@ -49,6 -50,8 +49,8 @@@
  
  #define msecs_to_loops(t) (loops_per_jiffy / 1000 * HZ * t)
  
+ #define MIN_OSCR_DELTA                16
+ 
  static void __iomem *regbase;
  
  static cycle_t vt8500_timer_read(struct clocksource *cs)
@@@ -79,7 -82,7 +81,7 @@@ static int vt8500_timer_set_next_event(
                cpu_relax();
        writel((unsigned long)alarm, regbase + TIMER_MATCH_VAL);
  
-       if ((signed)(alarm - clocksource.read(&clocksource)) <= 16)
+       if ((signed)(alarm - clocksource.read(&clocksource)) <= MIN_OSCR_DELTA)
                return -ETIME;
  
        writel(1, regbase + TIMER_IER_VAL);
@@@ -150,7 -153,7 +152,7 @@@ static void __init vt8500_timer_init(st
                pr_err("%s: setup_irq failed for %s\n", __func__,
                                                        clockevent.name);
        clockevents_config_and_register(&clockevent, VT8500_TIMER_HZ,
-                                       4, 0xf0000000);
+                                       MIN_OSCR_DELTA * 2, 0xf0000000);
  }
  
  CLOCKSOURCE_OF_DECLARE(vt8500, "via,vt8500-timer", vt8500_timer_init);