From: Geoff Thorpe <Geoff.Thorpe@xxxxxxxxxxxxx> Change-Id: I59de17c040cdd304f86306336fcf89f130f7db2d Signed-off-by: Geoff Thorpe <Geoff.Thorpe@xxxxxxxxxxxxx> --- arch/powerpc/platforms/85xx/corenet_generic.c | 8 +++++++- arch/powerpc/platforms/85xx/p1023_rdb.c | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/platforms/85xx/corenet_generic.c b/arch/powerpc/platforms/85xx/corenet_generic.c index 74faab7..20b8f9a 100644 --- a/arch/powerpc/platforms/85xx/corenet_generic.c +++ b/arch/powerpc/platforms/85xx/corenet_generic.c @@ -198,15 +198,21 @@ static int __init corenet_generic_probe(void) } /* Early setup is required for large chunks of contiguous (and coarsely-aligned) - * memory. The following shoe-horns Bman "init_early" calls into the + * memory. The following shoe-horns Q/Bman "init_early" calls into the * platform setup to let them parse their CCSR nodes early on. */ +#ifdef CONFIG_FSL_QMAN_CONFIG +void __init qman_init_early(void); +#endif #ifdef CONFIG_FSL_BMAN_CONFIG void __init bman_init_early(void); #endif __init void corenet_ds_init_early(void) { +#ifdef CONFIG_FSL_QMAN_CONFIG + qman_init_early(); +#endif #ifdef CONFIG_FSL_BMAN_CONFIG bman_init_early(); #endif diff --git a/arch/powerpc/platforms/85xx/p1023_rdb.c b/arch/powerpc/platforms/85xx/p1023_rdb.c index 624d3d6..dc69801 100644 --- a/arch/powerpc/platforms/85xx/p1023_rdb.c +++ b/arch/powerpc/platforms/85xx/p1023_rdb.c @@ -106,14 +106,20 @@ static int __init p1023_rdb_probe(void) } /* Early setup is required for large chunks of contiguous (and coarsely-aligned) - * memory. The following shoe-horns Bman "init_early" calls into the + * memory. The following shoe-horns Q/Bman "init_early" calls into the * platform setup to let them parse their CCSR nodes early on. */ +#ifdef CONFIG_FSL_QMAN_CONFIG +void __init qman_init_early(void); +#endif #ifdef CONFIG_FSL_BMAN_CONFIG void __init bman_init_early(void); #endif static __init void p1023_rdb_init_early(void) { +#ifdef CONFIG_FSL_QMAN_CONFIG + qman_init_early(); +#endif #ifdef CONFIG_FSL_BMAN_CONFIG bman_init_early(); #endif -- 2.2.2 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel