diff options
| author |   Olof Johansson <olof@lixom.net> | 2017-01-29 14:46:54 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-01-29 14:46:54 -0800 |
| commit | de474f9b9724c683789bda823c1a80d703738a45 (patch) | |
| tree | bb7ef7ee4f6631cc07c51803cbd4156b365874db | |
| parent | Merge tag 'aspeed-4.11-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed into next/defconfig (diff) | |
| parent | ARM: Keystone: Enable ARCH_HAS_RESET_CONTROLLER (diff) | |
| download | wireguard-linux-de474f9b9724c683789bda823c1a80d703738a45.tar.xz wireguard-linux-de474f9b9724c683789bda823c1a80d703738a45.zip | |
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>
| -rw-r--r-- | arch/arm/configs/keystone_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-keystone/Kconfig | 1 |
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 |