diff options
author | Rob Herring <rob.herring@calxeda.com> | 2012-12-30 11:15:04 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-01-08 00:08:24 -0500 |
commit | c05ee88f6f20746aff938a85ef49e777ef4c6513 (patch) | |
tree | 06ca5bd0f1bf6c26d2d84e5300dc467774f1dab9 /arch/arm/mach-highbank | |
parent | 3943deeddac65ab1d19fcc839ab58ef13a653532 (diff) |
ARM: highbank: fix typos with hignbank in power request functions
s/hignbank/highbank/
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-highbank')
-rw-r--r-- | arch/arm/mach-highbank/highbank.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-highbank/pm.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-highbank/sysregs.h | 8 | ||||
-rw-r--r-- | arch/arm/mach-highbank/system.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index dc248167d206..981dc1e1da51 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c | |||
@@ -135,7 +135,7 @@ static struct sys_timer highbank_timer = { | |||
135 | 135 | ||
136 | static void highbank_power_off(void) | 136 | static void highbank_power_off(void) |
137 | { | 137 | { |
138 | hignbank_set_pwr_shutdown(); | 138 | highbank_set_pwr_shutdown(); |
139 | 139 | ||
140 | while (1) | 140 | while (1) |
141 | cpu_do_idle(); | 141 | cpu_do_idle(); |
diff --git a/arch/arm/mach-highbank/pm.c b/arch/arm/mach-highbank/pm.c index 74aa135966f0..0f4ffd6d47c4 100644 --- a/arch/arm/mach-highbank/pm.c +++ b/arch/arm/mach-highbank/pm.c | |||
@@ -32,7 +32,7 @@ static int highbank_suspend_finish(unsigned long val) | |||
32 | 32 | ||
33 | static int highbank_pm_enter(suspend_state_t state) | 33 | static int highbank_pm_enter(suspend_state_t state) |
34 | { | 34 | { |
35 | hignbank_set_pwr_suspend(); | 35 | highbank_set_pwr_suspend(); |
36 | highbank_set_cpu_jump(0, cpu_resume); | 36 | highbank_set_cpu_jump(0, cpu_resume); |
37 | cpu_suspend(0, highbank_suspend_finish); | 37 | cpu_suspend(0, highbank_suspend_finish); |
38 | 38 | ||
diff --git a/arch/arm/mach-highbank/sysregs.h b/arch/arm/mach-highbank/sysregs.h index e13e8ea7c6cb..707cfd3d80ec 100644 --- a/arch/arm/mach-highbank/sysregs.h +++ b/arch/arm/mach-highbank/sysregs.h | |||
@@ -44,25 +44,25 @@ static inline void highbank_set_core_pwr(void) | |||
44 | writel_relaxed(1, sregs_base + SREG_CPU_PWR_CTRL(cpu)); | 44 | writel_relaxed(1, sregs_base + SREG_CPU_PWR_CTRL(cpu)); |
45 | } | 45 | } |
46 | 46 | ||
47 | static inline void hignbank_set_pwr_suspend(void) | 47 | static inline void highbank_set_pwr_suspend(void) |
48 | { | 48 | { |
49 | writel(HB_PWR_SUSPEND, sregs_base + HB_SREG_A9_PWR_REQ); | 49 | writel(HB_PWR_SUSPEND, sregs_base + HB_SREG_A9_PWR_REQ); |
50 | highbank_set_core_pwr(); | 50 | highbank_set_core_pwr(); |
51 | } | 51 | } |
52 | 52 | ||
53 | static inline void hignbank_set_pwr_shutdown(void) | 53 | static inline void highbank_set_pwr_shutdown(void) |
54 | { | 54 | { |
55 | writel(HB_PWR_SHUTDOWN, sregs_base + HB_SREG_A9_PWR_REQ); | 55 | writel(HB_PWR_SHUTDOWN, sregs_base + HB_SREG_A9_PWR_REQ); |
56 | highbank_set_core_pwr(); | 56 | highbank_set_core_pwr(); |
57 | } | 57 | } |
58 | 58 | ||
59 | static inline void hignbank_set_pwr_soft_reset(void) | 59 | static inline void highbank_set_pwr_soft_reset(void) |
60 | { | 60 | { |
61 | writel(HB_PWR_SOFT_RESET, sregs_base + HB_SREG_A9_PWR_REQ); | 61 | writel(HB_PWR_SOFT_RESET, sregs_base + HB_SREG_A9_PWR_REQ); |
62 | highbank_set_core_pwr(); | 62 | highbank_set_core_pwr(); |
63 | } | 63 | } |
64 | 64 | ||
65 | static inline void hignbank_set_pwr_hard_reset(void) | 65 | static inline void highbank_set_pwr_hard_reset(void) |
66 | { | 66 | { |
67 | writel(HB_PWR_HARD_RESET, sregs_base + HB_SREG_A9_PWR_REQ); | 67 | writel(HB_PWR_HARD_RESET, sregs_base + HB_SREG_A9_PWR_REQ); |
68 | highbank_set_core_pwr(); | 68 | highbank_set_core_pwr(); |
diff --git a/arch/arm/mach-highbank/system.c b/arch/arm/mach-highbank/system.c index aed96ad9bd4a..37d8384dcf19 100644 --- a/arch/arm/mach-highbank/system.c +++ b/arch/arm/mach-highbank/system.c | |||
@@ -22,9 +22,9 @@ | |||
22 | void highbank_restart(char mode, const char *cmd) | 22 | void highbank_restart(char mode, const char *cmd) |
23 | { | 23 | { |
24 | if (mode == 'h') | 24 | if (mode == 'h') |
25 | hignbank_set_pwr_hard_reset(); | 25 | highbank_set_pwr_hard_reset(); |
26 | else | 26 | else |
27 | hignbank_set_pwr_soft_reset(); | 27 | highbank_set_pwr_soft_reset(); |
28 | 28 | ||
29 | while (1) | 29 | while (1) |
30 | cpu_do_idle(); | 30 | cpu_do_idle(); |