diff options
Diffstat (limited to 'include/asm-powerpc/cpm2.h')
-rw-r--r-- | include/asm-powerpc/cpm2.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/asm-powerpc/cpm2.h b/include/asm-powerpc/cpm2.h index d7b57ac55892..e698b1d09dcf 100644 --- a/include/asm-powerpc/cpm2.h +++ b/include/asm-powerpc/cpm2.h | |||
@@ -11,6 +11,7 @@ | |||
11 | #define __CPM2__ | 11 | #define __CPM2__ |
12 | 12 | ||
13 | #include <asm/immap_cpm2.h> | 13 | #include <asm/immap_cpm2.h> |
14 | #include <asm/cpm.h> | ||
14 | 15 | ||
15 | /* CPM Command register. | 16 | /* CPM Command register. |
16 | */ | 17 | */ |
@@ -82,6 +83,7 @@ | |||
82 | #define mk_cr_cmd(PG, SBC, MCN, OP) \ | 83 | #define mk_cr_cmd(PG, SBC, MCN, OP) \ |
83 | ((PG << 26) | (SBC << 21) | (MCN << 6) | OP) | 84 | ((PG << 26) | (SBC << 21) | (MCN << 6) | OP) |
84 | 85 | ||
86 | #ifndef CONFIG_PPC_CPM_NEW_BINDING | ||
85 | /* Dual Port RAM addresses. The first 16K is available for almost | 87 | /* Dual Port RAM addresses. The first 16K is available for almost |
86 | * any CPM use, so we put the BDs there. The first 128 bytes are | 88 | * any CPM use, so we put the BDs there. The first 128 bytes are |
87 | * used for SMC1 and SMC2 parameter RAM, so we start allocating | 89 | * used for SMC1 and SMC2 parameter RAM, so we start allocating |
@@ -97,6 +99,7 @@ | |||
97 | #define CPM_DATAONLY_SIZE ((uint)(16 * 1024) - CPM_DATAONLY_BASE) | 99 | #define CPM_DATAONLY_SIZE ((uint)(16 * 1024) - CPM_DATAONLY_BASE) |
98 | #define CPM_FCC_SPECIAL_BASE ((uint)0x0000b000) | 100 | #define CPM_FCC_SPECIAL_BASE ((uint)0x0000b000) |
99 | #endif | 101 | #endif |
102 | #endif | ||
100 | 103 | ||
101 | /* The number of pages of host memory we allocate for CPM. This is | 104 | /* The number of pages of host memory we allocate for CPM. This is |
102 | * done early in kernel initialization to get physically contiguous | 105 | * done early in kernel initialization to get physically contiguous |
@@ -109,11 +112,18 @@ | |||
109 | */ | 112 | */ |
110 | extern cpm_cpm2_t __iomem *cpmp; /* Pointer to comm processor */ | 113 | extern cpm_cpm2_t __iomem *cpmp; /* Pointer to comm processor */ |
111 | 114 | ||
115 | #ifdef CONFIG_PPC_CPM_NEW_BINDING | ||
116 | #define cpm_dpalloc cpm_muram_alloc | ||
117 | #define cpm_dpfree cpm_muram_free | ||
118 | #define cpm_dpram_addr cpm_muram_addr | ||
119 | #else | ||
112 | extern unsigned long cpm_dpalloc(uint size, uint align); | 120 | extern unsigned long cpm_dpalloc(uint size, uint align); |
113 | extern int cpm_dpfree(unsigned long offset); | 121 | extern int cpm_dpfree(unsigned long offset); |
114 | extern unsigned long cpm_dpalloc_fixed(unsigned long offset, uint size, uint align); | 122 | extern unsigned long cpm_dpalloc_fixed(unsigned long offset, uint size, uint align); |
115 | extern void cpm_dpdump(void); | 123 | extern void cpm_dpdump(void); |
116 | extern void *cpm_dpram_addr(unsigned long offset); | 124 | extern void *cpm_dpram_addr(unsigned long offset); |
125 | #endif | ||
126 | |||
117 | extern void cpm_setbrg(uint brg, uint rate); | 127 | extern void cpm_setbrg(uint brg, uint rate); |
118 | extern void cpm2_fastbrg(uint brg, uint rate, int div16); | 128 | extern void cpm2_fastbrg(uint brg, uint rate, int div16); |
119 | extern void cpm2_reset(void); | 129 | extern void cpm2_reset(void); |