Merge tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC driver changes from Arnd Bergmann:
 "These changes are mostly for ARM specific device drivers that either
  don't have an upstream maintainer, or that had the maintainer ask us
  to pick up the changes to avoid conflicts.

  A large chunk of this are clock drivers (bcm281xx, exynos, versatile,
  shmobile), aside from that, reset controllers for STi as well as a
  large rework of the Marvell Orion/EBU watchdog driver are notable"

* tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (99 commits)
  Revert "dts: socfpga: Add DTS entry for adding the stmmac glue layer for stmmac."
  Revert "net: stmmac: Add SOCFPGA glue driver"
  ARM: shmobile: r8a7791: Fix SCIFA3-5 clocks
  ARM: STi: Add reset controller support to mach-sti Kconfig
  drivers: reset: stih416: add softreset controller
  drivers: reset: stih415: add softreset controller
  drivers: reset: Reset controller driver for STiH416
  drivers: reset: Reset controller driver for STiH415
  drivers: reset: STi SoC system configuration reset controller support
  dts: socfpga: Add sysmgr node so the gmac can use to reference
  dts: socfpga: Add support for SD/MMC on the SOCFPGA platform
  reset: Add optional resets and stubs
  ARM: shmobile: r7s72100: fix bus clock calculation
  Power: Reset: Generalize qnap-poweroff to work on Synology devices.
  dts: socfpga: Update clock entry to support multiple parents
  ARM: socfpga: Update socfpga_defconfig
  dts: socfpga: Add DTS entry for adding the stmmac glue layer for stmmac.
  net: stmmac: Add SOCFPGA glue driver
  watchdog: orion_wdt: Use %pa to print 'phys_addr_t'
  drivers: cci: Export CCI PMU revision
  ...

diff --cc arch/arm/boot/dts/r8a7790.dtsi
Simple merge

diff --cc arch/arm/boot/dts/socfpga.dtsi
Simple merge

diff --cc arch/arm/boot/dts/socfpga_vt.dts
Simple merge

diff --cc arch/arm/mach-davinci/board-dm644x-evm.c
Simple merge

diff --cc arch/arm/mach-integrator/Kconfig
Simple merge

diff --cc arch/arm/mach-integrator/integrator_ap.c
Simple merge

diff --cc arch/arm/mach-kirkwood/include/mach/bridge-regs.h
Simple merge

diff --cc arch/arm/mach-omap2/Kconfig
Simple merge

diff --cc arch/arm/mach-shmobile/clock-r8a7779.c
Simple merge

diff --cc arch/arm/mach-shmobile/include/mach/r8a7790.h
Simple merge

diff --cc drivers/bus/mvebu-mbus.c
Simple merge

diff --cc drivers/cpufreq/Kconfig.arm
Simple merge

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/irqchip/Kconfig
Simple merge

diff --cc drivers/irqchip/Makefile
Simple merge

diff --cc drivers/irqchip/irq-gic.c
index 63922b9ba6b750f289025e6c048712f07b3b277e,07a7050841ec73ddd37d6f2053188924a26c197f..4300b6606f5e3276c11656ff29506b665e9a2a87
--- 1/drivers/irqchip/irq-gic.c
--- 2/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@@ -869,8 -887,9 +887,9 @@@ static struct notifier_block gic_cpu_no
  };
  #endif
  
 -const struct irq_domain_ops gic_irq_domain_ops = {
 +static const struct irq_domain_ops gic_irq_domain_ops = {
        .map = gic_irq_domain_map,
+       .unmap = gic_irq_domain_unmap,
        .xlate = gic_irq_domain_xlate,
  };
  

diff --cc drivers/irqchip/irq-vic.c
Simple merge

diff --cc drivers/phy/Kconfig
index 8d3c49cc500fadcd212620f62df6d3cc9df68e4a,5e6b33f9c2945664885fc04af54a594c66c7727a..3bb05f17b9b4edcd05cc15e582aa049e64d01df5
--- 1/drivers/phy/Kconfig
--- 2/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@@ -27,7 -24,7 +27,7 @@@ config PHY_EXYNOS_MIPI_VIDE
  
  config PHY_MVEBU_SATA
        def_bool y
-       depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_DOVE
 -      depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD
++      depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_DOVE || MACH_KIRKWOOD
        depends on OF
        select GENERIC_PHY
  

diff --cc drivers/rtc/rtc-isl12057.c
Simple merge

diff --cc drivers/thermal/Kconfig
Simple merge

diff --cc drivers/tty/serial/Kconfig
Simple merge

diff --cc drivers/watchdog/Kconfig
index 0c6048d5c9a363a5ebd18256eaec3c149fff4d5b,f1ff408c4b17144a375c8dbbb2c1d2ab28d83fd5..74ec8fc5cc0303fa81fd036c87632c7f8524c824
--- 1/drivers/watchdog/Kconfig
--- 2/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@@ -301,7 -292,7 +301,7 @@@ config DAVINCI_WATCHDO
  
  config ORION_WATCHDOG
        tristate "Orion watchdog"
-       depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE || MACH_DOVE
 -      depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU
++      depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE || MACH_DOVE || ARCH_MVEBU
        select WATCHDOG_CORE
        help
          Say Y here if to include support for the watchdog timer

diff --cc drivers/watchdog/orion_wdt.c
index 498163497c1cc039db45a4f2fdd373b6dbf49d42,6f9b4c6e9bca6bcbb4990394dc1e2c2ec0ba2c77..9b3c41d1870370860d582f4e8e74cf5a290d54f6
--- 1/drivers/watchdog/orion_wdt.c
--- 2/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@@ -18,8 -18,9 +18,8 @@@
  #include <linux/kernel.h>
  #include <linux/platform_device.h>
  #include <linux/watchdog.h>
 -#include <linux/init.h>
+ #include <linux/interrupt.h>
  #include <linux/io.h>
- #include <linux/spinlock.h>
  #include <linux/clk.h>
  #include <linux/err.h>
  #include <linux/of.h>

diff --cc sound/soc/kirkwood/Kconfig
index 49f8437665dea5d326833a4aff3ad506c6c02d56,106e2e22fed2deef91c6b675674e47b12ae3ffa3..06f4e8aa93ae71675190901eb0005fc5cd86fd87
--- 1/sound/soc/kirkwood/Kconfig
--- 2/sound/soc/kirkwood/Kconfig
+++ b/sound/soc/kirkwood/Kconfig
@@@ -1,6 -1,6 +1,6 @@@
  config SND_KIRKWOOD_SOC
        tristate "SoC Audio for the Marvell Kirkwood and Dove chips"
-       depends on ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU || COMPILE_TEST
 -      depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD || COMPILE_TEST
++      depends on ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU || MACH_KIRKWOOD || COMPILE_TEST
        help
          Say Y or M if you want to add support for codecs attached to
          the Kirkwood I2S interface. You will also need to select the