Merge tag 'tags/cleanup2-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC late cleanups from Arnd Bergmann:
 "These could not be part of the first cleanup branch, because they
  either came too late in the cycle, or they have dependencies on other
  branches.  Important changes are:

   - The integrator platform is almost multiplatform capable after some
     reorganization (Linus Walleij)
   - Minor cleanups on Zynq (Michal Simek)
   - Lots of changes for Exynos and other Samsung platforms, including
     further preparations for multiplatform support and the clocks
     bindings are rearranged"

* tag 'tags/cleanup2-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits)
  devicetree: fix newly added exynos sata bindings
  ARM: EXYNOS: Fix compilation error in cpuidle.c
  ARM: S5P64X0: Explicitly include linux/serial_s3c.h in mach/pm-core.h
  ARM: EXYNOS: Remove hardware.h file
  ARM: SAMSUNG: Remove hardware.h inclusion
  ARM: S3C24XX: Remove invalid code from hardware.h
  dt-bindings: clock: Move exynos-audss-clk.h to dt-bindings/clock
  ARM: dts: Keep some essential LDOs enabled for arndale-octa board
  ARM: dts: Disable MDMA1 node for arndale-octa board
  ARM: S3C64XX: Fix build for implicit serial_s3c.h inclusion
  serial: s3c: Fix build of header without serial_core.h preinclusion
  ARM: EXYNOS: Allow wake-up using GIC interrupts
  ARM: EXYNOS: Stop using legacy Samsung PM code
  ARM: EXYNOS: Remove PM initcalls and useless indirection
  ARM: EXYNOS: Fix abuse of CONFIG_PM
  ARM: SAMSUNG: Move s3c_pm_check_* prototypes to plat/pm-common.h
  ARM: SAMSUNG: Move common save/restore helpers to separate file
  ARM: SAMSUNG: Move Samsung PM debug code into separate file
  ARM: SAMSUNG: Consolidate PM debug functions
  ARM: SAMSUNG: Use debug_ll_addr() to get UART base address
  ...

1 files changed, 4 insertions, 12 deletions

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 8d197dcdd2c0..fc8bf18e222d 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -24,7 +24,7 @@ config ARCH_EXYNOS4
         select HAVE_SMP
         select MIGHT_HAVE_CACHE_L2X0
         select PINCTRL
-        select PM_GENERIC_DOMAINS if PM
+        select PM_GENERIC_DOMAINS if PM_RUNTIME
         select S5P_DEV_MFC
         help
           Samsung EXYNOS4 SoCs based systems
@@ -46,10 +46,8 @@ config CPU_EXYNOS4210
         default y
         depends on ARCH_EXYNOS4
         select ARCH_HAS_BANDGAP
-        select ARM_CPU_SUSPEND if PM
+        select ARM_CPU_SUSPEND if PM_SLEEP
         select PINCTRL_EXYNOS
-        select S5P_PM if PM
-        select S5P_SLEEP if PM
         select SAMSUNG_DMADEV
         help
           Enable EXYNOS4210 CPU support
@@ -60,8 +58,6 @@ config SOC_EXYNOS4212
         depends on ARCH_EXYNOS4
         select ARCH_HAS_BANDGAP
         select PINCTRL_EXYNOS
-        select S5P_PM if PM
-        select S5P_SLEEP if PM
         select SAMSUNG_DMADEV
         help
           Enable EXYNOS4212 SoC support
@@ -82,9 +78,7 @@ config SOC_EXYNOS5250
         depends on ARCH_EXYNOS5
         select ARCH_HAS_BANDGAP
         select PINCTRL_EXYNOS
-        select PM_GENERIC_DOMAINS if PM
-        select S5P_PM if PM
-        select S5P_SLEEP if PM
+        select PM_GENERIC_DOMAINS if PM_RUNTIME
         select S5P_DEV_MFC
         select SAMSUNG_DMADEV
         help
@@ -94,9 +88,7 @@ config SOC_EXYNOS5420
         bool "SAMSUNG EXYNOS5420"
         default y
         depends on ARCH_EXYNOS5
-        select PM_GENERIC_DOMAINS if PM
-        select S5P_PM if PM
-        select S5P_SLEEP if PM
+        select PM_GENERIC_DOMAINS if PM_RUNTIME
         help
           Enable EXYNOS5420 SoC support