diff options
| author | Zhao Qiang <B45475@freescale.com> | 2014-09-30 02:25:25 (GMT) |
|---|---|---|
| committer | Matthew Weigel <Matthew.Weigel@freescale.com> | 2014-12-11 18:37:46 (GMT) |
| commit | 7ba5c48b5faf6fbd16e61263dfd4a380e3902569 (patch) | |
| tree | 8c9c7eb9fa5d44f7133669211082285b6097d164 /drivers/soc | |
| parent | 2c20b5b7c68a45e70a56df7a9c197c06e5a81290 (diff) | |
| download | linux-fsl-qoriq-7ba5c48b5faf6fbd16e61263dfd4a380e3902569.tar.xz | |
rheap: move rheap.c from arch/powerpc/lib/ to lib/
qe need to use the rheap, so move it to public directory.
Signed-off-by: Zhao Qiang <B45475@freescale.com>
---
upstream link: http://patchwork.ozlabs.org/patch/393170/
it is under discussion.
Change-Id: Ied2765d6e0eb3b7ade0fef02cfe226c8a8566c5f
Reviewed-on: http://git.am.freescale.net:8181/16841
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Xiaobo Xie <X.Xie@freescale.com>
Reviewed-by: Zhengxiong Jin <Jason.Jin@freescale.com>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/qe/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/soc/qe/qe.c | 2 | ||||
| -rw-r--r-- | drivers/soc/qe/qe_common.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/soc/qe/Kconfig b/drivers/soc/qe/Kconfig index 5c2b9d8..49118e1 100644 --- a/drivers/soc/qe/Kconfig +++ b/drivers/soc/qe/Kconfig @@ -5,7 +5,7 @@ config QUICC_ENGINE bool "Freescale QUICC Engine (QE) Support" depends on FSL_SOC && (PPC32 || PPC64) - select PPC_LIB_RHEAP + select LIB_RHEAP select CRC32 ---help--- The QUICC Engine (QE) is a new generation of communications diff --git a/drivers/soc/qe/qe.c b/drivers/soc/qe/qe.c index 25f0e0d..e0926f5 100644 --- a/drivers/soc/qe/qe.c +++ b/drivers/soc/qe/qe.c @@ -36,7 +36,7 @@ #include <linux/fsl/immap_qe.h> #include <linux/fsl/qe.h> #include <asm/prom.h> -#include <asm/rheap.h> +#include <linux/fsl/rheap.h> static void qe_snums_init(void); static int qe_sdma_init(void); diff --git a/drivers/soc/qe/qe_common.c b/drivers/soc/qe/qe_common.c index c82ddcc..8e93b88 100644 --- a/drivers/soc/qe/qe_common.c +++ b/drivers/soc/qe/qe_common.c @@ -26,12 +26,12 @@ #include <linux/slab.h> #include <linux/io.h> -#include <asm/rheap.h> +#include <linux/fsl/rheap.h> #include <linux/fsl/qe.h> static spinlock_t qe_muram_lock; -static rh_block_t qe_boot_muram_rh_block[16]; -static rh_info_t qe_muram_info; +static struct _rh_block qe_boot_muram_rh_block[16]; +static struct _rh_info qe_muram_info; static u8 __iomem *muram_vbase; static phys_addr_t muram_pbase; |