Merge branch 'v3.19-next/cleanup-samsung' into v3.19-next/mach-exynos

diff --cc arch/arm/mach-exynos/Makefile
index 775ee35,d634de5..bcefb54
--- 1/arch/arm/mach-exynos/Makefile
--- 2/arch/arm/mach-exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
@@@ -17,12 -16,8 +17,9 @@@ obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_
  
  obj-$(CONFIG_SMP)             += platsmp.o headsmp.o
  
- obj-$(CONFIG_HOTPLUG_CPU)     += hotplug.o
- CFLAGS_hotplug.o              += -march=armv7-a
- 
  plus_sec := $(call as-instr,.arch_extension sec,+sec)
  AFLAGS_exynos-smc.o           :=-Wa,-march=armv7-a$(plus_sec)
 +AFLAGS_sleep.o                        :=-Wa,-march=armv7-a$(plus_sec)
  
  obj-$(CONFIG_EXYNOS5420_MCPM) += mcpm-exynos.o
  CFLAGS_mcpm-exynos.o          += -march=armv7-a

diff --cc arch/arm/mach-exynos/common.h
Simple merge

diff --cc arch/arm/mach-exynos/platsmp.c
Simple merge

diff --cc arch/arm/mach-exynos/regs-pmu.h
index 4ea5e32,4e9b444..322f132
--- 1/arch/arm/mach-exynos/regs-pmu.h
--- 2/arch/arm/mach-exynos/regs-pmu.h
+++ b/arch/arm/mach-exynos/regs-pmu.h
@@@ -20,9 -20,8 +20,10 @@@
  
  #define S5P_USE_STANDBY_WFI0                  (1 << 16)
  #define S5P_USE_STANDBY_WFE0                  (1 << 24)
+ #define S5P_USE_DELAYED_RESET_ASSERTION               BIT(12)
  
 +#define EXYNOS_CORE_PO_RESET(n)                       ((1 << 4) << n)
 +#define EXYNOS_WAKEUP_FROM_LOWPWR             (1 << 28)
  #define EXYNOS_SWRESET                                0x0400
  #define EXYNOS5440_SWRESET                    0x00C4