diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 13:13:39 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-20 13:13:39 +0100 |
| commit | 825d96766ef012be3f88449e412760f7bad42775 (patch) | |
| tree | 3e5c0b77da8d08a7a7959e07f9497a2a76306959 /arch/arm/configs | |
| parent | 0700ec1361647cfc415df745cc76c09a2c914c37 (diff) | |
| parent | 97ef1af9b275924406556bfaec528a3e9e2980c7 (diff) | |
Merge tag 'keystone-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/defconfig
Pull "Keystone config updates for 3.19" from Santosh Shilimkar:
- Enable PCIE controller and related options
- Enable MDIO and ethernet phy options
- Enable DSP IRQCHIP option
* tag 'keystone-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
ARM: keystone: defconfig: add options to enable PCI controller
ARM: keystone: add pcie related options
ARM: keystone_defconfig: enable mdio and marvell eth phys
ARM: keystone_defconfig: enable dsp irq and gpio support
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/keystone_defconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/configs/keystone_defconfig b/arch/arm/configs/keystone_defconfig index 932ae40fb128..20a3ff99fae2 100644 --- a/arch/arm/configs/keystone_defconfig +++ b/arch/arm/configs/keystone_defconfig @@ -20,6 +20,9 @@ CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_ARCH_KEYSTONE=y CONFIG_ARM_LPAE=y +CONFIG_PCI=y +CONFIG_PCI_MSI=y +CONFIG_PCI_KEYSTONE=y CONFIG_SMP=y CONFIG_PREEMPT=y CONFIG_AEABI=y @@ -194,3 +197,7 @@ CONFIG_LEDS_TRIGGER_ONESHOT=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_BACKLIGHT=y CONFIG_LEDS_TRIGGER_GPIO=y +CONFIG_KEYSTONE_IRQ=y +CONFIG_GPIO_SYSCON=y +CONFIG_TI_DAVINCI_MDIO=y +CONFIG_MARVELL_PHY=y |