diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-06-25 15:34:00 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-06-25 20:26:30 +0200 |
commit | 6d12e796981254677a30366dd16b0a59bda2d898 (patch) | |
tree | bfee90fb514db5c72da5a5037e1cfcd93e5dd54f /arch/arm/mach-mvebu | |
parent | 11f9323a48875101bc4de6077155c17aed82cfc8 (diff) | |
parent | 8dbdb8e704db34085f5978c335c10256b0fb9629 (diff) | |
download | op-kernel-dev-6d12e796981254677a30366dd16b0a59bda2d898.zip op-kernel-dev-6d12e796981254677a30366dd16b0a59bda2d898.tar.gz |
Merge tag 'mvebu-fixes-3.16' of git://git.infradead.org/linux-mvebu into fixes
Merge "mvebu fixes for v3.16" from Jason Cooper:
- mvebu
- Fix broken SoC ID detection
- Select ARM_CPU_SUSPEND for v7
- Remove armada38x compatible string (no users yet)
- kirkwood
- Fix phy-connection-type on GuruPlug board
* tag 'mvebu-fixes-3.16' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: Fix the improper use of the compatible string armada38x using a wildcard
ARM: dts: kirkwood: fix phy-connection-type for Guruplug
ARM: mvebu: select ARM_CPU_SUSPEND for Marvell EBU v7 platforms
ARM: mvebu: Fix broken SoC ID detection
Diffstat (limited to 'arch/arm/mach-mvebu')
-rw-r--r-- | arch/arm/mach-mvebu/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 4a7c250..b9bc599 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -10,6 +10,7 @@ menuconfig ARCH_MVEBU select ZONE_DMA if ARM_LPAE select ARCH_REQUIRE_GPIOLIB select PCI_QUIRKS if PCI + select OF_ADDRESS_PCI if ARCH_MVEBU @@ -17,6 +18,7 @@ config MACH_MVEBU_V7 bool select ARMADA_370_XP_TIMER select CACHE_L2X0 + select ARM_CPU_SUSPEND config MACH_ARMADA_370 bool "Marvell Armada 370 boards" if ARCH_MULTI_V7 |