| Message ID | 1294333132-28592-5-git-send-email-galak@kernel.crashing.org |
|---|---|
| State | Superseded |
| Delegated to: | Kumar Gala |
| Headers | show |
Hello. On 06-01-2011 19:58, Kumar Gala wrote: > Add the needed defines and code to utilize the common 8xxx srio init > code to setup LAWs and modify device tree if we have SRIO enabled on a > board. > Signed-off-by: Kumar Gala<galak@kernel.crashing.org> > --- > arch/powerpc/cpu/mpc86xx/fdt.c | 9 ++++++++- > arch/powerpc/include/asm/immap_86xx.h | 4 +++- > 2 files changed, 11 insertions(+), 2 deletions(-) > diff --git a/arch/powerpc/cpu/mpc86xx/fdt.c b/arch/powerpc/cpu/mpc86xx/fdt.c > index ff89ee5..3b96bf5 100644 > --- a/arch/powerpc/cpu/mpc86xx/fdt.c > +++ b/arch/powerpc/cpu/mpc86xx/fdt.c [...] > @@ -14,6 +14,9 @@ > DECLARE_GLOBAL_DATA_PTR; > > extern void ft_fixup_num_cores(void *blob); > +#ifdef CONFIG_SYS_HAS_SRIO > +extern void ft_srio_setup(void *blob); > +#endif There's no need to enclose the *extern* declaration within #ifdef. WBR, Sergei
diff --git a/arch/powerpc/cpu/mpc86xx/fdt.c b/arch/powerpc/cpu/mpc86xx/fdt.c index ff89ee5..3b96bf5 100644 --- a/arch/powerpc/cpu/mpc86xx/fdt.c +++ b/arch/powerpc/cpu/mpc86xx/fdt.c @@ -1,5 +1,5 @@ /* - * Copyright 2008,2010 Freescale Semiconductor, Inc. + * Copyright 2008, 2011 Freescale Semiconductor, Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -14,6 +14,9 @@ DECLARE_GLOBAL_DATA_PTR; extern void ft_fixup_num_cores(void *blob); +#ifdef CONFIG_SYS_HAS_SRIO +extern void ft_srio_setup(void *blob); +#endif void ft_cpu_setup(void *blob, bd_t *bd) { @@ -58,4 +61,8 @@ void ft_cpu_setup(void *blob, bd_t *bd) ft_fixup_num_cores(blob); #endif + +#ifdef CONFIG_SYS_HAS_SRIO + ft_srio_setup(blob); +#endif } diff --git a/arch/powerpc/include/asm/immap_86xx.h b/arch/powerpc/include/asm/immap_86xx.h index 4e60cbb..cc338e4 100644 --- a/arch/powerpc/include/asm/immap_86xx.h +++ b/arch/powerpc/include/asm/immap_86xx.h @@ -1,7 +1,7 @@ /* * MPC86xx Internal Memory Map * - * Copyright 2004 Freescale Semiconductor + * Copyright 2004, 2011 Freescale Semiconductor * Jeff Brown (Jeffrey@freescale.com) * Srikanth Srinivasan (srikanth.srinivasan@freescale.com) * @@ -1205,6 +1205,8 @@ typedef struct ccsr_gur { #define MPC86xx_DEVDISR_PCI1 0x80000000 #define MPC86xx_DEVDISR_PCIE1 0x40000000 #define MPC86xx_DEVDISR_PCIE2 0x20000000 +#define MPC86xx_DEVDISR_SRIO 0x00080000 +#define MPC86xx_DEVDISR_RMSG 0x00040000 #define MPC86xx_DEVDISR_CPU0 0x00008000 #define MPC86xx_DEVDISR_CPU1 0x00004000 #define MPC86xx_RSTCR_HRST_REQ 0x00000002
Add the needed defines and code to utilize the common 8xxx srio init code to setup LAWs and modify device tree if we have SRIO enabled on a board. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> --- arch/powerpc/cpu/mpc86xx/fdt.c | 9 ++++++++- arch/powerpc/include/asm/immap_86xx.h | 4 +++- 2 files changed, 11 insertions(+), 2 deletions(-)