diff options
| author | Olof Johansson <olof@lixom.net> | 2016-07-05 05:51:03 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-07-05 05:51:03 +0200 |
| commit | 208b3e2038c8eed1c0fe455a942c1a720441a241 (patch) | |
| tree | 76627536b39f2708c576dd365834d9af1f975225 /arch | |
| parent | Merge tag 'arm-soc/for-4.8/defconfig' of http://github.com/Broadcom/stblinux ... (diff) | |
| parent | ARM: keystone: remove redundant depends on ARM_PATCH_PHYS_VIRT (diff) | |
| download | linux-208b3e2038c8eed1c0fe455a942c1a720441a241.tar.xz linux-208b3e2038c8eed1c0fe455a942c1a720441a241.zip | |
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: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/keystone_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-keystone/Kconfig | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/keystone_defconfig b/arch/arm/configs/keystone_defconfig index faba04d93ad5..71b42e66488a 100644 --- a/arch/arm/configs/keystone_defconfig +++ b/arch/arm/configs/keystone_defconfig @@ -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 diff --git a/arch/arm/mach-keystone/Kconfig b/arch/arm/mach-keystone/Kconfig index ea955f6db8b7..929fe91cc82b 100644 --- a/arch/arm/mach-keystone/Kconfig +++ b/arch/arm/mach-keystone/Kconfig @@ -1,7 +1,6 @@ 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. |