Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Blackfin: dpmc: relocate hibernate helper macros

This defines only get used in the hibernate code, so remove them from the
global dpmc header as no one else cares.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

+24 -26
-26
arch/blackfin/include/asm/dpmc.h
··· 134 134 unsigned short vr_settling_time; /* in us */ 135 135 }; 136 136 137 - #else 138 - 139 - #define PM_PUSH(x) \ 140 - R0 = [P0 + (x - SRAM_BASE_ADDRESS)];\ 141 - [--SP] = R0;\ 142 - 143 - #define PM_POP(x) \ 144 - R0 = [SP++];\ 145 - [P0 + (x - SRAM_BASE_ADDRESS)] = R0;\ 146 - 147 - #define PM_SYS_PUSH(x) \ 148 - R0 = [P0 + (x - PLL_CTL)];\ 149 - [--SP] = R0;\ 150 - 151 - #define PM_SYS_POP(x) \ 152 - R0 = [SP++];\ 153 - [P0 + (x - PLL_CTL)] = R0;\ 154 - 155 - #define PM_SYS_PUSH16(x) \ 156 - R0 = w[P0 + (x - PLL_CTL)];\ 157 - [--SP] = R0;\ 158 - 159 - #define PM_SYS_POP16(x) \ 160 - R0 = [SP++];\ 161 - w[P0 + (x - PLL_CTL)] = R0;\ 162 - 163 137 #endif 164 138 165 139 #endif /*_BLACKFIN_DPMC_H_*/
+24
arch/blackfin/mach-common/dpmc_modes.S
··· 268 268 269 269 .section .text 270 270 271 + #define PM_PUSH(x) \ 272 + R0 = [P0 + (x - SRAM_BASE_ADDRESS)];\ 273 + [--SP] = R0;\ 274 + 275 + #define PM_POP(x) \ 276 + R0 = [SP++];\ 277 + [P0 + (x - SRAM_BASE_ADDRESS)] = R0;\ 278 + 279 + #define PM_SYS_PUSH(x) \ 280 + R0 = [P0 + (x - PLL_CTL)];\ 281 + [--SP] = R0;\ 282 + 283 + #define PM_SYS_POP(x) \ 284 + R0 = [SP++];\ 285 + [P0 + (x - PLL_CTL)] = R0;\ 286 + 287 + #define PM_SYS_PUSH16(x) \ 288 + R0 = w[P0 + (x - PLL_CTL)];\ 289 + [--SP] = R0;\ 290 + 291 + #define PM_SYS_POP16(x) \ 292 + R0 = [SP++];\ 293 + w[P0 + (x - PLL_CTL)] = R0;\ 294 + 271 295 ENTRY(_do_hibernate) 272 296 [--SP] = ( R7:0, P5:0 ); 273 297 [--SP] = RETS;