Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de474f9b authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'keystone_config_for_4.11' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents b5f8c90c a2735c30

arch/arm/configs/keystone_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-keystone/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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