diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-08-26 15:08:19 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-08-26 15:08:19 +0000 |
| commit | 4a3f4233c56d2e6ce8e432ff9aaaaad5108d7ab8 (patch) | |
| tree | 354ba30d39673f25345f3fb5de64ec7c244fa6d1 /arch/arm/mach-exynos4/cpu.c | |
| parent | fcb8ce5cfe30ca9ca5c9a79cdfe26d1993e65e0c (diff) | |
| parent | 5d747c6f2c9e1615685866251416268a0f648ffc (diff) | |
| download | op-kernel-dev-4a3f4233c56d2e6ce8e432ff9aaaaad5108d7ab8.zip op-kernel-dev-4a3f4233c56d2e6ce8e432ff9aaaaad5108d7ab8.tar.gz | |
Merge branch 'samsung/fixes' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into fixes
Diffstat (limited to 'arch/arm/mach-exynos4/cpu.c')
| -rw-r--r-- | arch/arm/mach-exynos4/cpu.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos4/cpu.c b/arch/arm/mach-exynos4/cpu.c index 2d8a40c..746d6fc 100644 --- a/arch/arm/mach-exynos4/cpu.c +++ b/arch/arm/mach-exynos4/cpu.c @@ -24,12 +24,13 @@ #include <plat/exynos4.h> #include <plat/adc-core.h> #include <plat/sdhci.h> -#include <plat/devs.h> #include <plat/fb-core.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); @@ -128,6 +129,11 @@ static void exynos4_idle(void) local_irq_enable(); } +static void exynos4_sw_reset(void) +{ + __raw_writel(0x1, S5P_SWRESET); +} + /* * exynos4_map_io * @@ -241,5 +247,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); } |
