From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 Apr 2014 22:37:40 +0000 (-0700)
Subject: Merge tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: firefly_0821_release~176^2~4130
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cbda94e039c3862326a65d1d0506447af8330c3c;p=firefly-linux-kernel-4.4.55.git

Merge tag 'drivers-3.15' of git://git./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
  ...
---

cbda94e039c3862326a65d1d0506447af8330c3c
diff --cc drivers/irqchip/irq-gic.c
index 63922b9ba6b7,07a7050841ec..4300b6606f5e
--- a/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/phy/Kconfig
index 8d3c49cc500f,5e6b33f9c294..3bb05f17b9b4
--- a/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/watchdog/Kconfig
index 0c6048d5c9a3,f1ff408c4b17..74ec8fc5cc03
--- a/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 498163497c1c,6f9b4c6e9bca..9b3c41d18703
--- a/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 49f8437665de,106e2e22fed2..06f4e8aa93ae
--- a/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