From: Kukjin Kim Date: Fri, 21 Nov 2014 12:40:23 +0000 (+0900) Subject: Merge branch 'v3.19-next/cleanup-samsung' into v3.19-next/mach-exynos X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=68847edc835e582dacbc90ded0c51d27b2ee2bf7;p=linux-beck.git Merge branch 'v3.19-next/cleanup-samsung' into v3.19-next/mach-exynos --- 68847edc835e582dacbc90ded0c51d27b2ee2bf7 diff --cc arch/arm/mach-exynos/Makefile index 775ee35cb277,d634de588d96..bcefb5473ee4 --- a/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/regs-pmu.h index 4ea5e320c6d1,4e9b4440e2bd..322f13277c3b --- a/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