niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

powerpc/cpm: Remove !CONFIG_PPC_CPM_NEW_BINDING code

Browse source 
Now that arch/ppc is gone we always define CONFIG_PPC_CPM_NEW_BINDING so
we can remove all the code associated with !CONFIG_PPC_CPM_NEW_BINDING.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Kumar Gala 2008-06-12 08:12:49 -05:00
parent 0b2a2e5b77
commit d3c511ac1d
2 changed files with 0 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
include/asm-powerpc/cpm1.h
View file

@ -42,35 +42,15 @@
#define mk_cr_cmd(CH, CMD) ((CMD << 8) | (CH << 4)) #define mk_cr_cmd(CH, CMD) ((CMD << 8) | (CH << 4))
#ifndef CONFIG_PPC_CPM_NEW_BINDING
/* The dual ported RAM is multi-functional. Some areas can be (and are
* being) used for microcode. There is an area that can only be used
* as data ram for buffer descriptors, which is all we use right now.
* Currently the first 512 and last 256 bytes are used for microcode.
*/
#define CPM_DATAONLY_BASE ((uint)0x0800)
#define CPM_DATAONLY_SIZE ((uint)0x0700)
#define CPM_DP_NOSPACE ((uint)0x7fffffff)
#endif
/* Export the base address of the communication processor registers /* Export the base address of the communication processor registers
* and dual port ram. * and dual port ram.
*/ */
extern cpm8xx_t __iomem *cpmp; /* Pointer to comm processor */ extern cpm8xx_t __iomem *cpmp; /* Pointer to comm processor */
#ifdef CONFIG_PPC_CPM_NEW_BINDING
#define cpm_dpalloc cpm_muram_alloc #define cpm_dpalloc cpm_muram_alloc
#define cpm_dpfree cpm_muram_free #define cpm_dpfree cpm_muram_free
#define cpm_dpram_addr cpm_muram_addr #define cpm_dpram_addr cpm_muram_addr
#define cpm_dpram_phys cpm_muram_dma #define cpm_dpram_phys cpm_muram_dma
#else
extern unsigned long cpm_dpalloc(uint size, uint align);
extern int cpm_dpfree(unsigned long offset);
extern unsigned long cpm_dpalloc_fixed(unsigned long offset, uint size, uint align);
extern void cpm_dpdump(void);
extern void *cpm_dpram_addr(unsigned long offset);
extern uint cpm_dpram_phys(u8 *addr);
#endif
extern void cpm_setbrg(uint brg, uint rate); extern void cpm_setbrg(uint brg, uint rate);

26
include/asm-powerpc/cpm2.h
View file

@ -78,24 +78,6 @@
#define mk_cr_cmd(PG, SBC, MCN, OP) \ #define mk_cr_cmd(PG, SBC, MCN, OP) \
((PG << 26) | (SBC << 21) | (MCN << 6) | OP) ((PG << 26) | (SBC << 21) | (MCN << 6) | OP)
#ifndef CONFIG_PPC_CPM_NEW_BINDING
/* Dual Port RAM addresses. The first 16K is available for almost
* any CPM use, so we put the BDs there. The first 128 bytes are
* used for SMC1 and SMC2 parameter RAM, so we start allocating
* BDs above that. All of this must change when we start
* downloading RAM microcode.
*/
#define CPM_DATAONLY_BASE ((uint)128)
#define CPM_DP_NOSPACE ((uint)0x7fffffff)
#if defined(CONFIG_8272) || defined(CONFIG_MPC8555)
#define CPM_DATAONLY_SIZE ((uint)(8 * 1024) - CPM_DATAONLY_BASE)
#define CPM_FCC_SPECIAL_BASE ((uint)0x00009000)
#else
#define CPM_DATAONLY_SIZE ((uint)(16 * 1024) - CPM_DATAONLY_BASE)
#define CPM_FCC_SPECIAL_BASE ((uint)0x0000b000)
#endif
#endif
/* The number of pages of host memory we allocate for CPM. This is /* The number of pages of host memory we allocate for CPM. This is
* done early in kernel initialization to get physically contiguous * done early in kernel initialization to get physically contiguous
* pages. * pages.
@ -107,17 +89,9 @@
*/ */
extern cpm_cpm2_t __iomem *cpmp; /* Pointer to comm processor */ extern cpm_cpm2_t __iomem *cpmp; /* Pointer to comm processor */
#ifdef CONFIG_PPC_CPM_NEW_BINDING
#define cpm_dpalloc cpm_muram_alloc #define cpm_dpalloc cpm_muram_alloc
#define cpm_dpfree cpm_muram_free #define cpm_dpfree cpm_muram_free
#define cpm_dpram_addr cpm_muram_addr #define cpm_dpram_addr cpm_muram_addr
#else
extern unsigned long cpm_dpalloc(uint size, uint align);
extern int cpm_dpfree(unsigned long offset);
extern unsigned long cpm_dpalloc_fixed(unsigned long offset, uint size, uint align);
extern void cpm_dpdump(void);
extern void *cpm_dpram_addr(unsigned long offset);
#endif
extern void cpm_setbrg(uint brg, uint rate); extern void cpm_setbrg(uint brg, uint rate);
extern void cpm2_fastbrg(uint brg, uint rate, int div16); extern void cpm2_fastbrg(uint brg, uint rate, int div16);