diff options
Diffstat (limited to 'arch/arm/include/asm/mcpm.h')
-rw-r--r-- | arch/arm/include/asm/mcpm.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/include/asm/mcpm.h b/arch/arm/include/asm/mcpm.h index a5ff410dcdb6..d9702eb0b02b 100644 --- a/arch/arm/include/asm/mcpm.h +++ b/arch/arm/include/asm/mcpm.h | |||
@@ -98,14 +98,14 @@ int mcpm_cpu_power_up(unsigned int cpu, unsigned int cluster); | |||
98 | * previously in which case the caller should take appropriate action. | 98 | * previously in which case the caller should take appropriate action. |
99 | * | 99 | * |
100 | * On success, the CPU is not guaranteed to be truly halted until | 100 | * On success, the CPU is not guaranteed to be truly halted until |
101 | * mcpm_cpu_power_down_finish() subsequently returns non-zero for the | 101 | * mcpm_wait_for_cpu_powerdown() subsequently returns non-zero for the |
102 | * specified cpu. Until then, other CPUs should make sure they do not | 102 | * specified cpu. Until then, other CPUs should make sure they do not |
103 | * trash memory the target CPU might be executing/accessing. | 103 | * trash memory the target CPU might be executing/accessing. |
104 | */ | 104 | */ |
105 | void mcpm_cpu_power_down(void); | 105 | void mcpm_cpu_power_down(void); |
106 | 106 | ||
107 | /** | 107 | /** |
108 | * mcpm_cpu_power_down_finish - wait for a specified CPU to halt, and | 108 | * mcpm_wait_for_cpu_powerdown - wait for a specified CPU to halt, and |
109 | * make sure it is powered off | 109 | * make sure it is powered off |
110 | * | 110 | * |
111 | * @cpu: CPU number within given cluster | 111 | * @cpu: CPU number within given cluster |
@@ -127,7 +127,7 @@ void mcpm_cpu_power_down(void); | |||
127 | * - zero if the CPU is in a safely parked state | 127 | * - zero if the CPU is in a safely parked state |
128 | * - nonzero otherwise (e.g., timeout) | 128 | * - nonzero otherwise (e.g., timeout) |
129 | */ | 129 | */ |
130 | int mcpm_cpu_power_down_finish(unsigned int cpu, unsigned int cluster); | 130 | int mcpm_wait_for_cpu_powerdown(unsigned int cpu, unsigned int cluster); |
131 | 131 | ||
132 | /** | 132 | /** |
133 | * mcpm_cpu_suspend - bring the calling CPU in a suspended state | 133 | * mcpm_cpu_suspend - bring the calling CPU in a suspended state |
@@ -171,7 +171,7 @@ int mcpm_cpu_powered_up(void); | |||
171 | struct mcpm_platform_ops { | 171 | struct mcpm_platform_ops { |
172 | int (*power_up)(unsigned int cpu, unsigned int cluster); | 172 | int (*power_up)(unsigned int cpu, unsigned int cluster); |
173 | void (*power_down)(void); | 173 | void (*power_down)(void); |
174 | int (*power_down_finish)(unsigned int cpu, unsigned int cluster); | 174 | int (*wait_for_powerdown)(unsigned int cpu, unsigned int cluster); |
175 | void (*suspend)(u64); | 175 | void (*suspend)(u64); |
176 | void (*powered_up)(void); | 176 | void (*powered_up)(void); |
177 | }; | 177 | }; |