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>

diff --git a/arch/blackfin/include/asm/dpmc.h b/arch/blackfin/include/asm/dpmc.h
index edf2a2ad518313883ff26cb8fc49168a1d4db669..d1ba87793e9bbc153e13de2cd85cd30f1e1f6acd 100644 (file)
--- a/arch/blackfin/include/asm/dpmc.h
+++ b/arch/blackfin/include/asm/dpmc.h
@@ -134,32 +134,6 @@ struct bfin_dpmc_platform_data {
        unsigned short vr_settling_time; /* in us */
 };
 
-#else
-
-#define PM_PUSH(x) \
-       R0 = [P0 + (x - SRAM_BASE_ADDRESS)];\
-       [--SP] =  R0;\
-
-#define PM_POP(x) \
-       R0 = [SP++];\
-       [P0 + (x - SRAM_BASE_ADDRESS)] = R0;\
-
-#define PM_SYS_PUSH(x) \
-       R0 = [P0 + (x - PLL_CTL)];\
-       [--SP] =  R0;\
-
-#define PM_SYS_POP(x) \
-       R0 = [SP++];\
-       [P0 + (x - PLL_CTL)] = R0;\
-
-#define PM_SYS_PUSH16(x) \
-       R0 = w[P0 + (x - PLL_CTL)];\
-       [--SP] =  R0;\
-
-#define PM_SYS_POP16(x) \
-       R0 = [SP++];\
-       w[P0 + (x - PLL_CTL)] = R0;\
-
 #endif
 
 #endif /*_BLACKFIN_DPMC_H_*/

diff --git a/arch/blackfin/mach-common/dpmc_modes.S b/arch/blackfin/mach-common/dpmc_modes.S
index bebb01961622158f78bc53b970cac67e1b8dea0d..a36ca3c8da972db815aee1675465b7d95052b978 100644 (file)
--- a/arch/blackfin/mach-common/dpmc_modes.S
+++ b/arch/blackfin/mach-common/dpmc_modes.S
@@ -268,6 +268,30 @@ ENDPROC(_test_pll_locked)
 
 .section .text
 
+#define PM_PUSH(x) \
+       R0 = [P0 + (x - SRAM_BASE_ADDRESS)];\
+       [--SP] =  R0;\
+
+#define PM_POP(x) \
+       R0 = [SP++];\
+       [P0 + (x - SRAM_BASE_ADDRESS)] = R0;\
+
+#define PM_SYS_PUSH(x) \
+       R0 = [P0 + (x - PLL_CTL)];\
+       [--SP] =  R0;\
+
+#define PM_SYS_POP(x) \
+       R0 = [SP++];\
+       [P0 + (x - PLL_CTL)] = R0;\
+
+#define PM_SYS_PUSH16(x) \
+       R0 = w[P0 + (x - PLL_CTL)];\
+       [--SP] =  R0;\
+
+#define PM_SYS_POP16(x) \
+       R0 = [SP++];\
+       w[P0 + (x - PLL_CTL)] = R0;\
+
 ENTRY(_do_hibernate)
        [--SP] = ( R7:0, P5:0 );
        [--SP] =  RETS;