diff options
author | Zhao Qiang <qiang.zhao@freescale.com> | 2015-11-30 10:48:55 +0800 |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2015-12-22 17:10:18 -0600 |
commit | 1291e49e893703e04e129fe2e17e87af40757bf1 (patch) | |
tree | a256a6a6e4b3a1ded6d08afe17ce19ee20aac5dd /arch/powerpc/include/asm/cpm.h | |
parent | 0e6e01ff694ee222acc5a9184211678473c948e3 (diff) | |
download | linux-stable-1291e49e893703e04e129fe2e17e87af40757bf1.tar.gz linux-stable-1291e49e893703e04e129fe2e17e87af40757bf1.tar.bz2 linux-stable-1291e49e893703e04e129fe2e17e87af40757bf1.zip |
QE/CPM: move muram management functions to qe_common
QE and CPM have the same muram, they use the same management
functions. Now QE support both ARM and PowerPC, it is necessary
to move QE to "driver/soc", so move the muram management functions
from cpm_common to qe_common for preparing to move QE code to "driver/soc"
Signed-off-by: Zhao Qiang <qiang.zhao@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'arch/powerpc/include/asm/cpm.h')
-rw-r--r-- | arch/powerpc/include/asm/cpm.h | 47 |
1 files changed, 1 insertions, 46 deletions
diff --git a/arch/powerpc/include/asm/cpm.h b/arch/powerpc/include/asm/cpm.h index 46e86b50abf3..0958028cf31a 100644 --- a/arch/powerpc/include/asm/cpm.h +++ b/arch/powerpc/include/asm/cpm.h @@ -2,10 +2,10 @@ #define __CPM_H #include <linux/compiler.h> -#include <linux/genalloc.h> #include <linux/types.h> #include <linux/errno.h> #include <linux/of.h> +#include <asm/qe.h> /* * SPI Parameter RAM common to QE and CPM. @@ -156,51 +156,6 @@ typedef struct cpm_buf_desc { */ #define BD_I2C_START (0x0400) -int cpm_muram_init(void); - -#if defined(CONFIG_CPM) || defined(CONFIG_QUICC_ENGINE) -unsigned long cpm_muram_alloc(unsigned long size, unsigned long align); -int cpm_muram_free(unsigned long offset); -unsigned long cpm_muram_alloc_fixed(unsigned long offset, unsigned long size); -unsigned long cpm_muram_alloc_common(unsigned long size, genpool_algo_t algo, - void *data); -void __iomem *cpm_muram_addr(unsigned long offset); -unsigned long cpm_muram_offset(void __iomem *addr); -dma_addr_t cpm_muram_dma(void __iomem *addr); -#else -static inline unsigned long cpm_muram_alloc(unsigned long size, - unsigned long align) -{ - return -ENOSYS; -} - -static inline int cpm_muram_free(unsigned long offset) -{ - return -ENOSYS; -} - -static inline unsigned long cpm_muram_alloc_fixed(unsigned long offset, - unsigned long size) -{ - return -ENOSYS; -} - -static inline void __iomem *cpm_muram_addr(unsigned long offset) -{ - return NULL; -} - -static inline unsigned long cpm_muram_offset(void __iomem *addr) -{ - return -ENOSYS; -} - -static inline dma_addr_t cpm_muram_dma(void __iomem *addr) -{ - return 0; -} -#endif /* defined(CONFIG_CPM) || defined(CONFIG_QUICC_ENGINE) */ - #ifdef CONFIG_CPM int cpm_command(u32 command, u8 opcode); #else |