On Thu, Jan 19, 2012 at 11:00 PM, Zhicheng Fan <b32...@freescale.com> wrote:
> From: Fanzc <b32...@freeescale.com>
>
> Signed-off-by: Fanzc <b32...@freeescale.com>
Please use your full name (first and last name)
> ---
> arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 79
> ++++++++++++++++++++++++++++-
> 1 files changed, 78 insertions(+), 1 deletions(-)
>
> diff --git a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
> b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
> index 1950076..1ba67aa 100644
> --- a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
> +++ b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
> @@ -26,6 +26,9 @@
> #include <asm/prom.h>
> #include <asm/udbg.h>
> #include <asm/mpic.h>
> +#include <asm/qe.h>
> +#include <asm/qe_ic.h>
> +#include <asm/fsl_guts.h>
>
> #include <sysdev/fsl_soc.h>
> #include <sysdev/fsl_pci.h>
> @@ -47,6 +50,10 @@ void __init mpc85xx_rdb_pic_init(void)
> struct mpic *mpic;
> unsigned long root = of_get_flat_dt_root();
>
> +#ifdef CONFIG_QUICC_ENGINE
> + struct device_node *np;
> +#endif
> +
> if (of_flat_dt_is_compatible(root, "fsl,MPC85XXRDB-CAMP")) {
> mpic = mpic_alloc(NULL, 0,
> MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS |
> @@ -62,6 +69,18 @@ void __init mpc85xx_rdb_pic_init(void)
>
> BUG_ON(mpic == NULL);
> 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);
> +
> + } else
> + printk(KERN_ERR "Could not find qe-ic node\n");
Use pr_err instead of printk(KERN_ERR
> +#endif
> +
> }
>
> /*
> @@ -69,7 +88,7 @@ void __init mpc85xx_rdb_pic_init(void)
> */
> static void __init mpc85xx_rdb_setup_arch(void)
> {
> -#ifdef CONFIG_PCI
> +#if defined(CONFIG_PCI) || defined(CONFIG_QUICC_ENGINE)
> struct device_node *np;
> #endif
>
> @@ -85,6 +104,64 @@ static void __init mpc85xx_rdb_setup_arch(void)
> #endif
>
> mpc85xx_smp_init();
> +
> +#ifdef CONFIG_QUICC_ENGINE
> + np = of_find_compatible_node(NULL, NULL, "fsl,qe");
> + if (!np) {
> + printk(KERN_ERR "Could not find Quicc Engine node\n");
> + goto qe_fail;
> + }
> +
> + qe_reset();
> + of_node_put(np);
> +
> + np = of_find_node_by_name(NULL, "par_io");
> + if (np) {
> + struct device_node *ucc;
> +
> + par_io_init(np);
> + of_node_put(np);
> +
> + for_each_node_by_name(ucc, "ucc")
> + par_io_of_config(ucc);
> +
> + }
> + if (machine_is(p1025_rdb)) {
> +
> + __be32 __iomem *pmuxcr;
> +
> + np = of_find_node_by_name(NULL, "global-utilities");
> +
> + if (np) {
> + pmuxcr = of_iomap(np, 0) + MPC85xx_PMUXCR_OFFSET;
You're missing the iounmap().
--
Timur Tabi
Linux kernel developer at Freescale
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
