Merge tag 'keystone_config_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/defconfig

ARM: Keystone config support for 4.11

 - Enable Reset controller and on chip MSM RAM support.

* tag 'keystone_config_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: Keystone: Enable ARCH_HAS_RESET_CONTROLLER
  ARM: configs: keystone: Enable Generic on-chip SRAM driver

Signed-off-by: Olof Johansson <olof@lixom.net>

2 files changed, 2 insertions, 0 deletions

diff --git a/arch/arm/configs/keystone_defconfig b/arch/arm/configs/keystone_defconfig
index 78cd2f197e01..1331f6dc456a 100644
--- a/arch/arm/configs/keystone_defconfig
+++ b/arch/arm/configs/keystone_defconfig
@@ -126,6 +126,7 @@ CONFIG_MTD_NAND_DAVINCI=y
 CONFIG_MTD_SPI_NOR=y
 CONFIG_MTD_UBI=y
 CONFIG_BLK_DEV_LOOP=y
+CONFIG_SRAM=y
 CONFIG_EEPROM_AT24=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
diff --git a/arch/arm/mach-keystone/Kconfig b/arch/arm/mach-keystone/Kconfig
index 24bd64dabdfc..554357035f30 100644
--- a/arch/arm/mach-keystone/Kconfig
+++ b/arch/arm/mach-keystone/Kconfig
@@ -4,6 +4,7 @@ config ARCH_KEYSTONE
         select ARM_GIC
         select HAVE_ARM_ARCH_TIMER
         select KEYSTONE_TIMER
+        select ARCH_HAS_RESET_CONTROLLER
         select ARM_ERRATA_798181 if SMP
         select COMMON_CLK_KEYSTONE
         select ARCH_SUPPORTS_BIG_ENDIAN