From: Arnd Bergmann <arnd@arndb.de>
Date: Sat, 26 Jul 2014 16:17:08 +0000 (+0200)
Subject: Merge tag 'mvebu-soc-3.17-4' of git://git.infradead.org/linux-mvebu into next/soc
X-Git-Tag: v3.17-rc1~79^2~8
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=39fbf984089e27ec102e246a03c247b7bbd063bd;p=karo-tx-linux.git

Merge tag 'mvebu-soc-3.17-4' of git://git.infradead.org/linux-mvebu into next/soc

Merge "mvebu SoC changes for v3.17 (round 4)" from Jason Cooper:

 - Armada XP
    - Fix return value check in pmsu code
    - Document URLs for new public datasheets (Thanks, Marvell & free-electrons!)

 - Armada 370/38x
    - Add cpuidle support

 - mvebu
    - Fix build when no platforms are selected
    - Update EBU SoC status in docs

* tag 'mvebu-soc-3.17-4' of git://git.infradead.org/linux-mvebu: (21 commits)
  Documentation: arm: misc updates to Marvell EBU SoC status
  Documentation: arm: add URLs to public datasheets for the Marvell Armada XP SoC
  ARM: mvebu: fix build without platforms selected
  ARM: mvebu: add cpuidle support for Armada 38x
  ARM: mvebu: add cpuidle support for Armada 370
  cpuidle: mvebu: add Armada 38x support
  cpuidle: mvebu: add Armada 370 support
  cpuidle: mvebu: rename the driver from armada-370-xp to mvebu-v7
  ARM: mvebu: export the SCU address
  ARM: mvebu: make the snoop disabling optional in mvebu_v7_pmsu_idle_prepare()
  ARM: mvebu: use a local variable to store the resume address
  ARM: mvebu: make the cpuidle initialization more generic
  ARM: mvebu: rename the armada_370_xp symbols to mvebu_v7 in pmsu.c
  ARM: mvebu: use the common function for Armada 375 SMP workaround
  ARM: mvebu: add a common function for the boot address work around
  ARM: mvebu: sort the #include of pmsu.c in alphabetic order
  ARM: mvebu: split again armada_370_xp_pmsu_idle_enter() in PMSU code
  ARM: mvebu: fix return value check in armada_xp_pmsu_cpufreq_init()
  clk: mvebu: extend clk-cpu for dynamic frequency scaling
  ARM: mvebu: extend PMSU code to support dynamic frequency scaling
  ...

Conflicts:
	arch/arm/mach-mvebu/Kconfig
	drivers/cpuidle/cpuidle-armada-370-xp.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

39fbf984089e27ec102e246a03c247b7bbd063bd
diff --cc arch/arm/mach-mvebu/Kconfig
index 955d4a3afabd,ae417607e108..c1e4567a5ab3
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@@ -14,6 -14,11 +14,9 @@@ menuconfig ARCH_MVEB
  
  if ARCH_MVEBU
  
 -menu "Marvell EBU SoC variants"
 -
+ config MACH_MVEBU_ANY
+ 	bool
+ 
  config MACH_MVEBU_V7
  	bool
  	select ARMADA_370_XP_TIMER
diff --cc drivers/cpuidle/Kconfig.arm
index 2f6b33ea6e08,a563427ce819..33fc0ff0af1c
--- a/drivers/cpuidle/Kconfig.arm
+++ b/drivers/cpuidle/Kconfig.arm
@@@ -1,15 -1,9 +1,9 @@@
  #
  # ARM CPU Idle drivers
  #
- config ARM_ARMADA_370_XP_CPUIDLE
- 	bool "CPU Idle Driver for Armada 370/XP family processors"
- 	depends on ARCH_MVEBU
- 	help
- 	  Select this to enable cpuidle on Armada 370/XP processors.
- 
  config ARM_BIG_LITTLE_CPUIDLE
  	bool "Support for ARM big.LITTLE processors"
 -	depends on ARCH_VEXPRESS_TC2_PM
 +	depends on ARCH_VEXPRESS_TC2_PM || ARCH_EXYNOS
  	select ARM_CPU_SUSPEND
  	select CPU_IDLE_MULTIPLE_DRIVERS
  	help