Merge tag 'at91-drivers-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull AT91 reset, poweroff and ram drivers from Maxime Ripard:
 "This tag holds the various new drivers introduced to move code that used to be
  in mach-at91 over to the proper frameworks.

  These files are the reboot and poweroff code for all AT91 SoCs but the RM9200,
  and the ram controller driver is not doing much at the time, except for grabing
  the RAM clock in order to leave it always enabled."

Conflicts:
	arch/arm/mach-at91/Kconfig

diff --cc arch/arm/mach-at91/Kconfig
index dd28e1f,7a69ffd..6aa7ab4
--- 1/arch/arm/mach-at91/Kconfig
--- 2/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@@ -50,17 -45,23 +50,21 @@@ config HAVE_AT91_SM
  config SOC_AT91SAM9
        bool
        select AT91_SAM9_TIME
 +      select ATMEL_AIC_IRQ if !OLD_IRQ_AT91
        select CPU_ARM926T
        select GENERIC_CLOCKEVENTS
 -      select MULTI_IRQ_HANDLER
 -      select SPARSE_IRQ
+       select MEMORY if USE_OF
+       select ATMEL_SDRAMC if USE_OF
  
  config SOC_SAMA5
        bool
        select AT91_SAM9_TIME
 +      select ATMEL_AIC5_IRQ
        select CPU_V7
        select GENERIC_CLOCKEVENTS
 -      select MULTI_IRQ_HANDLER
 -      select SPARSE_IRQ
        select USE_OF
+       select MEMORY
+       select ATMEL_SDRAMC
  
  menu "Atmel AT91 System-on-Chip"
  

diff --cc arch/arm/mach-at91/setup.c
Simple merge

diff --cc drivers/memory/Kconfig
Simple merge

diff --cc drivers/memory/Makefile
index 4055c47,b863726..c32d319
--- 1/drivers/memory/Makefile
--- 2/drivers/memory/Makefile
+++ b/drivers/memory/Makefile
@@@ -5,9 -5,9 +5,10 @@@
  ifeq ($(CONFIG_DDR),y)
  obj-$(CONFIG_OF)              += of_memory.o
  endif
+ obj-$(CONFIG_ATMEL_SDRAMC)    += atmel-sdramc.o
  obj-$(CONFIG_TI_AEMIF)                += ti-aemif.o
  obj-$(CONFIG_TI_EMIF)         += emif.o
 +obj-$(CONFIG_FSL_CORENET_CF)  += fsl-corenet-cf.o
  obj-$(CONFIG_FSL_IFC)         += fsl_ifc.o
  obj-$(CONFIG_MVEBU_DEVBUS)    += mvebu-devbus.o
  obj-$(CONFIG_TEGRA20_MC)      += tegra20-mc.o

diff --cc drivers/power/reset/Kconfig
index ca41523,1f9d0c5..c1c046d
--- 1/drivers/power/reset/Kconfig
--- 2/drivers/power/reset/Kconfig
+++ b/drivers/power/reset/Kconfig
@@@ -20,34 -38,17 +38,34 @@@ config POWER_RESET_AXXI
  
          Say Y if you have an Axxia family SoC.
  
 +config POWER_RESET_BRCMSTB
 +      bool "Broadcom STB reset driver" if COMPILE_TEST
 +      depends on POWER_RESET && ARM
 +      default ARCH_BRCMSTB
 +      help
 +        This driver provides restart support for ARM-based Broadcom STB
 +        boards.
 +
 +        Say Y here if you have an ARM-based Broadcom STB board and you wish
 +        to have restart support.
 +
  config POWER_RESET_GPIO
        bool "GPIO power-off driver"
-       depends on OF_GPIO && POWER_RESET
+       depends on OF_GPIO
        help
          This driver supports turning off your board via a GPIO line.
          If your board needs a GPIO high/low to power down, say Y and
          create a binding in your devicetree.
  
 +config POWER_RESET_HISI
 +      bool "Hisilicon power-off driver"
 +      depends on POWER_RESET && ARCH_HISI
 +      help
 +        Reboot support for Hisilicon boards.
 +
  config POWER_RESET_MSM
        bool "Qualcomm MSM power-off driver"
-       depends on POWER_RESET && ARCH_QCOM
+       depends on ARCH_QCOM
        help
          Power off and restart support for Qualcomm boards.
  

diff --cc drivers/power/reset/Makefile
index a42e70e,8bf941b..4433a75
--- 1/drivers/power/reset/Makefile
--- 2/drivers/power/reset/Makefile
+++ b/drivers/power/reset/Makefile
@@@ -1,8 -1,8 +1,10 @@@
  obj-$(CONFIG_POWER_RESET_AS3722) += as3722-poweroff.o
+ obj-$(CONFIG_POWER_RESET_AT91_POWEROFF) += at91-poweroff.o
+ obj-$(CONFIG_POWER_RESET_AT91_RESET) += at91-reset.o
  obj-$(CONFIG_POWER_RESET_AXXIA) += axxia-reset.o
 +obj-$(CONFIG_POWER_RESET_BRCMSTB) += brcmstb-reboot.o
  obj-$(CONFIG_POWER_RESET_GPIO) += gpio-poweroff.o
 +obj-$(CONFIG_POWER_RESET_HISI) += hisi-reboot.o
  obj-$(CONFIG_POWER_RESET_MSM) += msm-poweroff.o
  obj-$(CONFIG_POWER_RESET_QNAP) += qnap-poweroff.o
  obj-$(CONFIG_POWER_RESET_RESTART) += restart-poweroff.o