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

Commit 208b3e20 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'keystone_config_for_4.8' of... 

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

ARM: Keystone config updates for 4.8

	- Enable PINCTRL support
	- Remove redundant ARM_PATCH_PHYS_VIRT

* tag 'keystone_config_for_4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone

:
  ARM: keystone: remove redundant depends on ARM_PATCH_PHYS_VIRT
  ARM: keystone: Enable PINCTRL_SINGLE Config
  ARM: keystone: Enable PINCTRL config

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 856dfb0c 229a4bc8

arch/arm/configs/keystone_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ CONFIG_I2C_DAVINCI=y 
CONFIG_SPI=y

CONFIG_SPI_DAVINCI=y

CONFIG_SPI_SPIDEV=y

CONFIG_PINCTRL_SINGLE=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_DAVINCI=y

arch/arm/mach-keystone/Kconfig

+1 −1
Original line number Diff line number Diff line 
config ARCH_KEYSTONE

	bool "Texas Instruments Keystone Devices"

	depends on ARCH_MULTI_V7

	depends on ARM_PATCH_PHYS_VIRT

	select ARM_GIC

	select HAVE_ARM_ARCH_TIMER

	select CLKSRC_MMIO
@@ -11,6 +10,7 @@ config ARCH_KEYSTONE 
	select ZONE_DMA if ARM_LPAE

	select MIGHT_HAVE_PCI

	select PCI_DOMAINS if PCI

	select PINCTRL

	help

	  Support for boards based on the Texas Instruments Keystone family of

	  SoCs.