diff options
| author | Jongpill Lee <boyko.lee@samsung.com> | 2010-07-23 08:39:15 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-05 05:31:02 -0400 |
| commit | 4550ee20c8d1c280bd26ec3afbcf636ae2897486 (patch) | |
| tree | 0a772f7ee90972db8a765cd4460e93396d54d4bf | |
| parent | f5807269ea1fd93e9306191247fd67400ea5f66c (diff) | |
ARM: S5PV210: Add s5pv210_sw_reset for SWRESET
This patch adds s5pv210_sw_reset() which includes SWRESET for S5PV210/S5PC110.
Signed-off-by: Jongpill Lee <boyko.lee@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| -rw-r--r-- | arch/arm/mach-s5pv210/cpu.c | 9 | ||||
| -rw-r--r-- | arch/arm/mach-s5pv210/include/mach/regs-clock.h | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c index a0b1687247c9..ede163707db1 100644 --- a/arch/arm/mach-s5pv210/cpu.c +++ b/arch/arm/mach-s5pv210/cpu.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include <plat/iic-core.h> | 36 | #include <plat/iic-core.h> |
| 37 | #include <plat/keypad-core.h> | 37 | #include <plat/keypad-core.h> |
| 38 | #include <plat/sdhci.h> | 38 | #include <plat/sdhci.h> |
| 39 | #include <plat/reset.h> | ||
| 39 | 40 | ||
| 40 | /* Initial IO mappings */ | 41 | /* Initial IO mappings */ |
| 41 | 42 | ||
| @@ -71,6 +72,11 @@ static void s5pv210_idle(void) | |||
| 71 | local_irq_enable(); | 72 | local_irq_enable(); |
| 72 | } | 73 | } |
| 73 | 74 | ||
| 75 | static void s5pv210_sw_reset(void) | ||
| 76 | { | ||
| 77 | __raw_writel(0x1, S5P_SWRESET); | ||
| 78 | } | ||
| 79 | |||
| 74 | /* s5pv210_map_io | 80 | /* s5pv210_map_io |
| 75 | * | 81 | * |
| 76 | * register the standard cpu IO areas | 82 | * register the standard cpu IO areas |
| @@ -145,5 +151,8 @@ int __init s5pv210_init(void) | |||
| 145 | /* set idle function */ | 151 | /* set idle function */ |
| 146 | pm_idle = s5pv210_idle; | 152 | pm_idle = s5pv210_idle; |
| 147 | 153 | ||
| 154 | /* set sw_reset function */ | ||
| 155 | s5p_reset_hook = s5pv210_sw_reset; | ||
| 156 | |||
| 148 | return sysdev_register(&s5pv210_sysdev); | 157 | return sysdev_register(&s5pv210_sysdev); |
| 149 | } | 158 | } |
diff --git a/arch/arm/mach-s5pv210/include/mach/regs-clock.h b/arch/arm/mach-s5pv210/include/mach/regs-clock.h index 2a25ab40c863..499aef737476 100644 --- a/arch/arm/mach-s5pv210/include/mach/regs-clock.h +++ b/arch/arm/mach-s5pv210/include/mach/regs-clock.h | |||
| @@ -90,6 +90,8 @@ | |||
| 90 | #define S5P_CLKDIV0_PCLK66_SHIFT (28) | 90 | #define S5P_CLKDIV0_PCLK66_SHIFT (28) |
| 91 | #define S5P_CLKDIV0_PCLK66_MASK (0x7 << S5P_CLKDIV0_PCLK66_SHIFT) | 91 | #define S5P_CLKDIV0_PCLK66_MASK (0x7 << S5P_CLKDIV0_PCLK66_SHIFT) |
| 92 | 92 | ||
| 93 | #define S5P_SWRESET S5P_CLKREG(0x2000) | ||
| 94 | |||
| 93 | /* Registers related to power management */ | 95 | /* Registers related to power management */ |
| 94 | #define S5P_PWR_CFG S5P_CLKREG(0xC000) | 96 | #define S5P_PWR_CFG S5P_CLKREG(0xC000) |
| 95 | #define S5P_EINT_WAKEUP_MASK S5P_CLKREG(0xC004) | 97 | #define S5P_EINT_WAKEUP_MASK S5P_CLKREG(0xC004) |
