From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 15 Dec 2015 23:57:08 +0000 (+0100)
Subject: Merge tag 'mvebu-soc-4.5-1' of git://git.infradead.org/linux-mvebu into next/multipla... 
X-Git-Tag: android-x86-7.1-r1~2189^2~15
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3081dc9eff32519bc3298c6dba0b877675d4c1cd;p=android-x86%2Fkernel.git

Merge tag 'mvebu-soc-4.5-1' of git://git.infradead.org/linux-mvebu into next/multiplatform

Merge "mvebu soc for 4.5 (part 1)" from Gregory CLEMENT:

- orion5x/mv78xx0 multiplatform conversion
- legacy dove PMU support conversion

* tag 'mvebu-soc-4.5-1' of git://git.infradead.org/linux-mvebu:
  ARM: dove: convert legacy dove to PMU support
  soc: dove: add legacy support to PMU driver
  ARM: orion5x: multiplatform support
  ARM: orion5x: clean up mach/*.h headers
  ARM: mv78xx0: multiplatform support
  ARM: mv78xx0: clean up mach/*.h headers
  ARM: orion: use SPARSE_IRQ everywhere
  ARM: orion: always use MULTI_IRQ_HANDLER
  ARM: orion: move watchdog setup to mach-orion5x

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-dove/include/mach/entry-macro.S
	arch/arm/mach-orion5x/include/mach/entry-macro.S
---

3081dc9eff32519bc3298c6dba0b877675d4c1cd
diff --cc arch/arm/Kconfig
index 70eb100b56e7,72af9d6f8c13..72c1df041ae8
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -500,33 -520,22 +503,6 @@@ config ARCH_DOV
  	help
  	  Support for the Marvell Dove SoC 88AP510
  
- config ARCH_MV78XX0
- 	bool "Marvell MV78xx0"
- 	select ARCH_REQUIRE_GPIOLIB
- 	select CPU_FEROCEON
- 	select GENERIC_CLOCKEVENTS
- 	select MVEBU_MBUS
- 	select PCI
- 	select PLAT_ORION_LEGACY
- 	help
- 	  Support for the following Marvell MV78xx0 series SoCs:
- 	  MV781x0, MV782x0.
- 
- config ARCH_ORION5X
- 	bool "Marvell Orion"
 -config ARCH_MMP
 -	bool "Marvell PXA168/910/MMP2"
--	depends on MMU
--	select ARCH_REQUIRE_GPIOLIB
- 	select CPU_FEROCEON
 -	select CLKDEV_LOOKUP
 -	select GENERIC_ALLOCATOR
--	select GENERIC_CLOCKEVENTS
- 	select MVEBU_MBUS
- 	select PCI
- 	select PLAT_ORION_LEGACY
 -	select GPIO_PXA
 -	select IRQ_DOMAIN
--	select MULTI_IRQ_HANDLER
 -	select PINCTRL
 -	select PLAT_PXA
 -	select SPARSE_IRQ
--	help
- 	  Support for the following Marvell Orion 5x series SoCs:
- 	  Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),
- 	  Orion-2 (5281), Orion-1-90 (6183).
 -	  Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line.
--
  config ARCH_KS8695
  	bool "Micrel/Kendin KS8695"
  	select ARCH_REQUIRE_GPIOLIB