diff options
author | John Stultz <john.stultz@linaro.org> | 2011-09-14 12:07:50 -0700 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2011-09-14 12:07:50 -0700 |
commit | 8e5922b81be9a9548c0cee8ffe3d14bb58b95387 (patch) | |
tree | 72356bc5d1fe562cb62f9c4d9e0d8fcd44f8b775 /arch/arm/mach-exynos4/cpu.c | |
parent | 3f1fc539a29e09d940df1418b36d23621f85d545 (diff) | |
parent | f392cbf75615e9d8cb90ef5ffb8d4e752b7be3c7 (diff) |
Merge branch 'upstream/linaro-3.0' into linaro-android-3.0
Conflicts:
arch/arm/kernel/entry-armv.S
Diffstat (limited to 'arch/arm/mach-exynos4/cpu.c')
-rw-r--r-- | arch/arm/mach-exynos4/cpu.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos4/cpu.c b/arch/arm/mach-exynos4/cpu.c index bfd621460ab..1139608fa11 100644 --- a/arch/arm/mach-exynos4/cpu.c +++ b/arch/arm/mach-exynos4/cpu.c @@ -24,8 +24,10 @@ #include <plat/devs.h> #include <plat/fimc-core.h> #include <plat/iic-core.h> +#include <plat/reset.h> #include <mach/regs-irq.h> +#include <mach/regs-pmu.h> extern int combiner_init(unsigned int combiner_nr, void __iomem *base, unsigned int irq_start); @@ -114,6 +116,11 @@ static void exynos4_idle(void) local_irq_enable(); } +static void exynos4_sw_reset(void) +{ + __raw_writel(0x1, S5P_SWRESET); +} + /* * exynos4_map_io * @@ -222,5 +229,8 @@ int __init exynos4_init(void) /* set idle function */ pm_idle = exynos4_idle; + /* set sw_reset function */ + s5p_reset_hook = exynos4_sw_reset; + return sysdev_register(&exynos4_sysdev); } |