Depends:
 - Based on v3.6-rc5
 - kirkwood/addr_decode

New drivers:
 - pinctrl (dove, kirkwood, mvebu)
 - gpio (mvebu)

Conflicts:
 - kirkwood/boards (arch/arm/Kconfig)
    - keep MIGHT_HAVE_PCI
    - keep PLAT_ORION_LEGACY over PLAT_ORION
    - allow add USB_ARCH_HAS_EHCI

Resolution should look like this:

config ARCH_DOVE
	bool "Marvell Dove"
	select CPU_V7
	select ARCH_REQUIRE_GPIOLIB
	select GENERIC_CLOCKEVENTS
	select MIGHT_HAVE_PCI
	select NEED_MACH_IO_H
	select PLAT_ORION_LEGACY
	select USB_ARCH_HAS_EHCI
	help
	  Support for the Marvell Dove SoC 88AP510
arm: mvebu: add gpio support in defconfig

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
1 file changed