diff options
| author | Zhao Qiang <B45475@freescale.com> | 2014-04-14 06:49:54 (GMT) |
|---|---|---|
| committer | Jose Rivera <German.Rivera@freescale.com> | 2014-04-14 22:28:28 (GMT) |
| commit | 7188e1a04ff61f57fc71593bfdc6862d23407a70 (patch) | |
| tree | 934037c749054a17ceb655a2db17ff3ed1ed0e6c /arch/powerpc/platforms | |
| parent | dc850cb1713746aaa56cd6b1a322e231472d779d (diff) | |
| download | linux-fsl-qoriq-7188e1a04ff61f57fc71593bfdc6862d23407a70.tar.xz | |
QE: Add "ifdef CONFIG_QUICC_ENGINE" for qe
qe and qe_ic shouldn't be initialized when QUICC_ENGINE
is not selected.
Signed-off-by: Zhao Qiang <B45475@freescale.com>
Change-Id: If9b1b22499dade52ebc0727b6c0ec923f520cdd1
Reviewed-on: http://git.am.freescale.net:8181/10936
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Xiaobo Xie <X.Xie@freescale.com>
Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/85xx/corenet_generic.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/85xx/corenet_generic.c b/arch/powerpc/platforms/85xx/corenet_generic.c index 693f284..45a61bb 100644 --- a/arch/powerpc/platforms/85xx/corenet_generic.c +++ b/arch/powerpc/platforms/85xx/corenet_generic.c @@ -42,7 +42,9 @@ void __init corenet_gen_pic_init(void) unsigned int flags = MPIC_BIG_ENDIAN | MPIC_SINGLE_DEST_CPU | MPIC_NO_RESET; +#ifdef CONFIG_QUICC_ENGINE struct device_node *np; +#endif if (ppc_md.get_irq == mpic_get_coreint_irq) flags |= MPIC_ENABLE_COREINT; @@ -52,12 +54,14 @@ void __init corenet_gen_pic_init(void) mpic_init(mpic); +#ifdef CONFIG_QUICC_ENGINE np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic"); if (np) { qe_ic_init(np, 0, qe_ic_cascade_low_mpic, qe_ic_cascade_high_mpic); of_node_put(np); } +#endif } /* @@ -108,9 +112,11 @@ static const struct of_device_id of_device_ids[] = { { .compatible = "fsl,qoriq-pcie-v3.0", }, +#ifdef CONFIG_QUICC_ENGINE { .compatible = "fsl,qe", }, +#endif /* The following two are for the Freescale hypervisor */ { .name = "hypervisor", |