On Feb 16, 2012, at 11:21 AM, Timur Tabi wrote:
> Remove the check for CONFIG_PPC_85xx and CONFIG_PPC_86xx from fsl_guts.h.
> The check was originally intended to allow the same header file to
> be used on 85xx and 86xx systems, even though the Global Utilities
> register could be different. It turns out that they're not actually
> different, and so the check is not necessary. In addition, neither
> macro is defined for 64-bit e5500 kernels, so that causes a build
> break.
>
> To maintain backwards compatibility, we also define macros for
> ccsr_guts_85xx and ccsr_guts_86xx. This eliminates the need to
> change all the files that #include fsl_guts.h. Those files will
> be updated at a later time, and then the macros can be deleted.
If you are doing this clean, just finish it. There are only a small handful of
users of ccsr_guts_8{5,6}xx:
arch/powerpc/include/asm/fsl_guts.h:static inline void guts_set_dmacr(struct
ccsr_guts_86xx __iomem *guts,
arch/powerpc/include/asm/fsl_guts.h:static inline void
guts_set_pmuxcr_dma(struct ccsr_guts_86xx __iomem *guts,
arch/powerpc/platforms/86xx/mpc8610_hpcd.c: struct ccsr_guts_86xx __iomem
*guts;
arch/powerpc/platforms/85xx/p1022_ds.c: struct ccsr_guts_85xx __iomem *guts;
arch/powerpc/platforms/85xx/p1022_ds.c: struct ccsr_guts_85xx __iomem *guts;
- k
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
