Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc/fsl: Move fsl_guts.h out of arch/powerpc

Freescale's Layerscape ARM chips use the same structure.

Signed-off-by: Scott Wood <scottwood@freescale.com>

+15 -15
+4 -4
arch/powerpc/include/asm/fsl_guts.h include/linux/fsl/guts.h
··· 12 12 * option) any later version. 13 13 */ 14 14 15 - #ifndef __ASM_POWERPC_FSL_GUTS_H__ 16 - #define __ASM_POWERPC_FSL_GUTS_H__ 17 - #ifdef __KERNEL__ 15 + #ifndef __FSL_GUTS_H__ 16 + #define __FSL_GUTS_H__ 17 + 18 + #include <linux/types.h> 18 19 19 20 /** 20 21 * Global Utility Registers. ··· 189 188 190 189 #endif 191 190 192 - #endif 193 191 #endif
+1 -1
arch/powerpc/platforms/85xx/mpc85xx_mds.c
··· 34 34 #include <linux/of_device.h> 35 35 #include <linux/phy.h> 36 36 #include <linux/memblock.h> 37 + #include <linux/fsl/guts.h> 37 38 38 39 #include <linux/atomic.h> 39 40 #include <asm/time.h> ··· 52 51 #include <asm/qe_ic.h> 53 52 #include <asm/mpic.h> 54 53 #include <asm/swiotlb.h> 55 - #include <asm/fsl_guts.h> 56 54 #include "smp.h" 57 55 58 56 #include "mpc85xx.h"
+1 -1
arch/powerpc/platforms/85xx/mpc85xx_rdb.c
··· 17 17 #include <linux/seq_file.h> 18 18 #include <linux/interrupt.h> 19 19 #include <linux/of_platform.h> 20 + #include <linux/fsl/guts.h> 20 21 21 22 #include <asm/time.h> 22 23 #include <asm/machdep.h> ··· 28 27 #include <asm/mpic.h> 29 28 #include <asm/qe.h> 30 29 #include <asm/qe_ic.h> 31 - #include <asm/fsl_guts.h> 32 30 33 31 #include <sysdev/fsl_soc.h> 34 32 #include <sysdev/fsl_pci.h>
+1 -1
arch/powerpc/platforms/85xx/p1022_ds.c
··· 16 16 * kind, whether express or implied. 17 17 */ 18 18 19 + #include <linux/fsl/guts.h> 19 20 #include <linux/pci.h> 20 21 #include <linux/of_platform.h> 21 22 #include <asm/div64.h> ··· 26 25 #include <sysdev/fsl_soc.h> 27 26 #include <sysdev/fsl_pci.h> 28 27 #include <asm/udbg.h> 29 - #include <asm/fsl_guts.h> 30 28 #include <asm/fsl_lbc.h> 31 29 #include "smp.h" 32 30
+1 -1
arch/powerpc/platforms/85xx/p1022_rdk.c
··· 12 12 * kind, whether express or implied. 13 13 */ 14 14 15 + #include <linux/fsl/guts.h> 15 16 #include <linux/pci.h> 16 17 #include <linux/of_platform.h> 17 18 #include <asm/div64.h> ··· 22 21 #include <sysdev/fsl_soc.h> 23 22 #include <sysdev/fsl_pci.h> 24 23 #include <asm/udbg.h> 25 - #include <asm/fsl_guts.h> 26 24 #include "smp.h" 27 25 28 26 #include "mpc85xx.h"
+1 -1
arch/powerpc/platforms/85xx/smp.c
··· 19 19 #include <linux/kexec.h> 20 20 #include <linux/highmem.h> 21 21 #include <linux/cpu.h> 22 + #include <linux/fsl/guts.h> 22 23 23 24 #include <asm/machdep.h> 24 25 #include <asm/pgtable.h> ··· 27 26 #include <asm/mpic.h> 28 27 #include <asm/cacheflush.h> 29 28 #include <asm/dbell.h> 30 - #include <asm/fsl_guts.h> 31 29 #include <asm/code-patching.h> 32 30 #include <asm/cputhreads.h> 33 31
+1 -1
arch/powerpc/platforms/85xx/twr_p102x.c
··· 15 15 #include <linux/kernel.h> 16 16 #include <linux/init.h> 17 17 #include <linux/errno.h> 18 + #include <linux/fsl/guts.h> 18 19 #include <linux/pci.h> 19 20 #include <linux/of_platform.h> 20 21 ··· 24 23 #include <asm/mpic.h> 25 24 #include <asm/qe.h> 26 25 #include <asm/qe_ic.h> 27 - #include <asm/fsl_guts.h> 28 26 29 27 #include <sysdev/fsl_soc.h> 30 28 #include <sysdev/fsl_pci.h>
+1 -1
arch/powerpc/platforms/86xx/mpc8610_hpcd.c
··· 24 24 #include <linux/delay.h> 25 25 #include <linux/seq_file.h> 26 26 #include <linux/of.h> 27 + #include <linux/fsl/guts.h> 27 28 28 29 #include <asm/time.h> 29 30 #include <asm/machdep.h> ··· 39 38 #include <sysdev/fsl_pci.h> 40 39 #include <sysdev/fsl_soc.h> 41 40 #include <sysdev/simple_gpio.h> 42 - #include <asm/fsl_guts.h> 43 41 44 42 #include "mpc86xx.h" 45 43
+1 -1
drivers/iommu/fsl_pamu.c
··· 20 20 21 21 #include "fsl_pamu.h" 22 22 23 + #include <linux/fsl/guts.h> 23 24 #include <linux/interrupt.h> 24 25 #include <linux/genalloc.h> 25 26 26 27 #include <asm/mpc85xx.h> 27 - #include <asm/fsl_guts.h> 28 28 29 29 /* define indexes for each operation mapping scenario */ 30 30 #define OMI_QMAN 0x00
+1 -1
sound/soc/fsl/mpc8610_hpcd.c
··· 12 12 13 13 #include <linux/module.h> 14 14 #include <linux/interrupt.h> 15 + #include <linux/fsl/guts.h> 15 16 #include <linux/of_address.h> 16 17 #include <linux/of_device.h> 17 18 #include <linux/slab.h> 18 19 #include <sound/soc.h> 19 - #include <asm/fsl_guts.h> 20 20 21 21 #include "fsl_dma.h" 22 22 #include "fsl_ssi.h"
+1 -1
sound/soc/fsl/p1022_ds.c
··· 11 11 */ 12 12 13 13 #include <linux/module.h> 14 + #include <linux/fsl/guts.h> 14 15 #include <linux/interrupt.h> 15 16 #include <linux/of_address.h> 16 17 #include <linux/of_device.h> 17 18 #include <linux/slab.h> 18 19 #include <sound/soc.h> 19 - #include <asm/fsl_guts.h> 20 20 21 21 #include "fsl_dma.h" 22 22 #include "fsl_ssi.h"
+1 -1
sound/soc/fsl/p1022_rdk.c
··· 18 18 */ 19 19 20 20 #include <linux/module.h> 21 + #include <linux/fsl/guts.h> 21 22 #include <linux/interrupt.h> 22 23 #include <linux/of_address.h> 23 24 #include <linux/of_device.h> 24 25 #include <linux/slab.h> 25 26 #include <sound/soc.h> 26 - #include <asm/fsl_guts.h> 27 27 28 28 #include "fsl_dma.h" 29 29 #include "fsl_ssi.h"