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

Commit 825d9676 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'keystone-soc' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 0700ec13 97ef1af9

arch/arm/configs/keystone_defconfig

+7 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,9 @@ CONFIG_MODULE_FORCE_UNLOAD=y 
CONFIG_MODVERSIONS=y

CONFIG_MODVERSIONS=y

CONFIG_ARCH_KEYSTONE=y

CONFIG_ARCH_KEYSTONE=y

CONFIG_ARM_LPAE=y

CONFIG_ARM_LPAE=y

CONFIG_PCI=y

CONFIG_PCI_MSI=y

CONFIG_PCI_KEYSTONE=y

CONFIG_SMP=y

CONFIG_SMP=y

CONFIG_PREEMPT=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_AEABI=y
@@ -194,3 +197,7 @@ CONFIG_LEDS_TRIGGER_ONESHOT=y 
CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_BACKLIGHT=y

CONFIG_LEDS_TRIGGER_BACKLIGHT=y

CONFIG_LEDS_TRIGGER_GPIO=y

CONFIG_LEDS_TRIGGER_GPIO=y

CONFIG_KEYSTONE_IRQ=y

CONFIG_GPIO_SYSCON=y

CONFIG_TI_DAVINCI_MDIO=y

CONFIG_MARVELL_PHY=y

arch/arm/mach-keystone/Kconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -9,6 +9,8 @@ config ARCH_KEYSTONE 
	select COMMON_CLK_KEYSTONE

	select COMMON_CLK_KEYSTONE

	select ARCH_SUPPORTS_BIG_ENDIAN

	select ARCH_SUPPORTS_BIG_ENDIAN

	select ZONE_DMA if ARM_LPAE

	select ZONE_DMA if ARM_LPAE

	select MIGHT_HAVE_PCI

	select PCI_DOMAINS if PCI

	help

	help

	  Support for boards based on the Texas Instruments Keystone family of

	  Support for boards based on the Texas Instruments Keystone family of

	  SoCs.
 
	  SoCs.