summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/powerpc/platforms/85xx/mpc85xx_mds.c2
-rw-r--r--arch/powerpc/platforms/85xx/mpc85xx_rdb.c2
-rw-r--r--arch/powerpc/platforms/85xx/p1022_ds.c2
-rw-r--r--arch/powerpc/platforms/85xx/p1022_rdk.c2
-rw-r--r--arch/powerpc/platforms/85xx/smp.c2
-rw-r--r--arch/powerpc/platforms/85xx/twr_p102x.c2
-rw-r--r--arch/powerpc/platforms/86xx/mpc8610_hpcd.c2
-rw-r--r--drivers/iommu/fsl_pamu.c2
-rw-r--r--include/linux/fsl/guts.h (renamed from arch/powerpc/include/asm/fsl_guts.h)8
-rw-r--r--sound/soc/fsl/mpc8610_hpcd.c2
-rw-r--r--sound/soc/fsl/p1022_ds.c2
-rw-r--r--sound/soc/fsl/p1022_rdk.c2
12 files changed, 15 insertions, 15 deletions
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index a392e94a07fa..f0be439ceaaa 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -34,6 +34,7 @@
34#include <linux/of_device.h> 34#include <linux/of_device.h>
35#include <linux/phy.h> 35#include <linux/phy.h>
36#include <linux/memblock.h> 36#include <linux/memblock.h>
37#include <linux/fsl/guts.h>
37 38
38#include <linux/atomic.h> 39#include <linux/atomic.h>
39#include <asm/time.h> 40#include <asm/time.h>
@@ -51,7 +52,6 @@
51#include <asm/qe_ic.h> 52#include <asm/qe_ic.h>
52#include <asm/mpic.h> 53#include <asm/mpic.h>
53#include <asm/swiotlb.h> 54#include <asm/swiotlb.h>
54#include <asm/fsl_guts.h>
55#include "smp.h" 55#include "smp.h"
56 56
57#include "mpc85xx.h" 57#include "mpc85xx.h"
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
index e358bed66d01..50dcc00a0f5a 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
@@ -17,6 +17,7 @@
17#include <linux/seq_file.h> 17#include <linux/seq_file.h>
18#include <linux/interrupt.h> 18#include <linux/interrupt.h>
19#include <linux/of_platform.h> 19#include <linux/of_platform.h>
20#include <linux/fsl/guts.h>
20 21
21#include <asm/time.h> 22#include <asm/time.h>
22#include <asm/machdep.h> 23#include <asm/machdep.h>
@@ -27,7 +28,6 @@
27#include <asm/mpic.h> 28#include <asm/mpic.h>
28#include <asm/qe.h> 29#include <asm/qe.h>
29#include <asm/qe_ic.h> 30#include <asm/qe_ic.h>
30#include <asm/fsl_guts.h>
31 31
32#include <sysdev/fsl_soc.h> 32#include <sysdev/fsl_soc.h>
33#include <sysdev/fsl_pci.h> 33#include <sysdev/fsl_pci.h>
diff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c
index 6ac986d3f8a3..371df822e88e 100644
--- a/arch/powerpc/platforms/85xx/p1022_ds.c
+++ b/arch/powerpc/platforms/85xx/p1022_ds.c
@@ -16,6 +16,7 @@
16 * kind, whether express or implied. 16 * kind, whether express or implied.
17 */ 17 */
18 18
19#include <linux/fsl/guts.h>
19#include <linux/pci.h> 20#include <linux/pci.h>
20#include <linux/of_platform.h> 21#include <linux/of_platform.h>
21#include <asm/div64.h> 22#include <asm/div64.h>
@@ -25,7 +26,6 @@
25#include <sysdev/fsl_soc.h> 26#include <sysdev/fsl_soc.h>
26#include <sysdev/fsl_pci.h> 27#include <sysdev/fsl_pci.h>
27#include <asm/udbg.h> 28#include <asm/udbg.h>
28#include <asm/fsl_guts.h>
29#include <asm/fsl_lbc.h> 29#include <asm/fsl_lbc.h>
30#include "smp.h" 30#include "smp.h"
31 31
diff --git a/arch/powerpc/platforms/85xx/p1022_rdk.c b/arch/powerpc/platforms/85xx/p1022_rdk.c
index 680232d6ba48..5087becaa8bc 100644
--- a/arch/powerpc/platforms/85xx/p1022_rdk.c
+++ b/arch/powerpc/platforms/85xx/p1022_rdk.c
@@ -12,6 +12,7 @@
12 * kind, whether express or implied. 12 * kind, whether express or implied.
13 */ 13 */
14 14
15#include <linux/fsl/guts.h>
15#include <linux/pci.h> 16#include <linux/pci.h>
16#include <linux/of_platform.h> 17#include <linux/of_platform.h>
17#include <asm/div64.h> 18#include <asm/div64.h>
@@ -21,7 +22,6 @@
21#include <sysdev/fsl_soc.h> 22#include <sysdev/fsl_soc.h>
22#include <sysdev/fsl_pci.h> 23#include <sysdev/fsl_pci.h>
23#include <asm/udbg.h> 24#include <asm/udbg.h>
24#include <asm/fsl_guts.h>
25#include "smp.h" 25#include "smp.h"
26 26
27#include "mpc85xx.h" 27#include "mpc85xx.h"
diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c
index b8b821697910..6ac7786e076a 100644
--- a/arch/powerpc/platforms/85xx/smp.c
+++ b/arch/powerpc/platforms/85xx/smp.c
@@ -19,6 +19,7 @@
19#include <linux/kexec.h> 19#include <linux/kexec.h>
20#include <linux/highmem.h> 20#include <linux/highmem.h>
21#include <linux/cpu.h> 21#include <linux/cpu.h>
22#include <linux/fsl/guts.h>
22 23
23#include <asm/machdep.h> 24#include <asm/machdep.h>
24#include <asm/pgtable.h> 25#include <asm/pgtable.h>
@@ -26,7 +27,6 @@
26#include <asm/mpic.h> 27#include <asm/mpic.h>
27#include <asm/cacheflush.h> 28#include <asm/cacheflush.h>
28#include <asm/dbell.h> 29#include <asm/dbell.h>
29#include <asm/fsl_guts.h>
30#include <asm/code-patching.h> 30#include <asm/code-patching.h>
31#include <asm/cputhreads.h> 31#include <asm/cputhreads.h>
32 32
diff --git a/arch/powerpc/platforms/85xx/twr_p102x.c b/arch/powerpc/platforms/85xx/twr_p102x.c
index 30e002f4648c..892e613519cc 100644
--- a/arch/powerpc/platforms/85xx/twr_p102x.c
+++ b/arch/powerpc/platforms/85xx/twr_p102x.c
@@ -15,6 +15,7 @@
15#include <linux/kernel.h> 15#include <linux/kernel.h>
16#include <linux/init.h> 16#include <linux/init.h>
17#include <linux/errno.h> 17#include <linux/errno.h>
18#include <linux/fsl/guts.h>
18#include <linux/pci.h> 19#include <linux/pci.h>
19#include <linux/of_platform.h> 20#include <linux/of_platform.h>
20 21
@@ -23,7 +24,6 @@
23#include <asm/mpic.h> 24#include <asm/mpic.h>
24#include <asm/qe.h> 25#include <asm/qe.h>
25#include <asm/qe_ic.h> 26#include <asm/qe_ic.h>
26#include <asm/fsl_guts.h>
27 27
28#include <sysdev/fsl_soc.h> 28#include <sysdev/fsl_soc.h>
29#include <sysdev/fsl_pci.h> 29#include <sysdev/fsl_pci.h>
diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
index 55413a547ea8..437a9c372ae1 100644
--- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
@@ -24,6 +24,7 @@
24#include <linux/delay.h> 24#include <linux/delay.h>
25#include <linux/seq_file.h> 25#include <linux/seq_file.h>
26#include <linux/of.h> 26#include <linux/of.h>
27#include <linux/fsl/guts.h>
27 28
28#include <asm/time.h> 29#include <asm/time.h>
29#include <asm/machdep.h> 30#include <asm/machdep.h>
@@ -38,7 +39,6 @@
38#include <sysdev/fsl_pci.h> 39#include <sysdev/fsl_pci.h>
39#include <sysdev/fsl_soc.h> 40#include <sysdev/fsl_soc.h>
40#include <sysdev/simple_gpio.h> 41#include <sysdev/simple_gpio.h>
41#include <asm/fsl_guts.h>
42 42
43#include "mpc86xx.h" 43#include "mpc86xx.h"
44 44
diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c
index 2570f2a25dc4..a34355fca37a 100644
--- a/drivers/iommu/fsl_pamu.c
+++ b/drivers/iommu/fsl_pamu.c
@@ -20,11 +20,11 @@
20 20
21#include "fsl_pamu.h" 21#include "fsl_pamu.h"
22 22
23#include <linux/fsl/guts.h>
23#include <linux/interrupt.h> 24#include <linux/interrupt.h>
24#include <linux/genalloc.h> 25#include <linux/genalloc.h>
25 26
26#include <asm/mpc85xx.h> 27#include <asm/mpc85xx.h>
27#include <asm/fsl_guts.h>
28 28
29/* define indexes for each operation mapping scenario */ 29/* define indexes for each operation mapping scenario */
30#define OMI_QMAN 0x00 30#define OMI_QMAN 0x00
diff --git a/arch/powerpc/include/asm/fsl_guts.h b/include/linux/fsl/guts.h
index 43b6bb1a4a9c..84d971ff3fba 100644
--- a/arch/powerpc/include/asm/fsl_guts.h
+++ b/include/linux/fsl/guts.h
@@ -12,9 +12,10 @@
12 * option) any later version. 12 * option) any later version.
13 */ 13 */
14 14
15#ifndef __ASM_POWERPC_FSL_GUTS_H__ 15#ifndef __FSL_GUTS_H__
16#define __ASM_POWERPC_FSL_GUTS_H__ 16#define __FSL_GUTS_H__
17#ifdef __KERNEL__ 17
18#include <linux/types.h>
18 19
19/** 20/**
20 * Global Utility Registers. 21 * Global Utility Registers.
@@ -189,4 +190,3 @@ static inline void guts_set_pmuxcr_dma(struct ccsr_guts __iomem *guts,
189#endif 190#endif
190 191
191#endif 192#endif
192#endif
diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c
index 9621b9140df6..6f236f170cf5 100644
--- a/sound/soc/fsl/mpc8610_hpcd.c
+++ b/sound/soc/fsl/mpc8610_hpcd.c
@@ -12,11 +12,11 @@
12 12
13#include <linux/module.h> 13#include <linux/module.h>
14#include <linux/interrupt.h> 14#include <linux/interrupt.h>
15#include <linux/fsl/guts.h>
15#include <linux/of_address.h> 16#include <linux/of_address.h>
16#include <linux/of_device.h> 17#include <linux/of_device.h>
17#include <linux/slab.h> 18#include <linux/slab.h>
18#include <sound/soc.h> 19#include <sound/soc.h>
19#include <asm/fsl_guts.h>
20 20
21#include "fsl_dma.h" 21#include "fsl_dma.h"
22#include "fsl_ssi.h" 22#include "fsl_ssi.h"
diff --git a/sound/soc/fsl/p1022_ds.c b/sound/soc/fsl/p1022_ds.c
index 71c1a7dc3aeb..747aab0602bd 100644
--- a/sound/soc/fsl/p1022_ds.c
+++ b/sound/soc/fsl/p1022_ds.c
@@ -11,12 +11,12 @@
11 */ 11 */
12 12
13#include <linux/module.h> 13#include <linux/module.h>
14#include <linux/fsl/guts.h>
14#include <linux/interrupt.h> 15#include <linux/interrupt.h>
15#include <linux/of_address.h> 16#include <linux/of_address.h>
16#include <linux/of_device.h> 17#include <linux/of_device.h>
17#include <linux/slab.h> 18#include <linux/slab.h>
18#include <sound/soc.h> 19#include <sound/soc.h>
19#include <asm/fsl_guts.h>
20 20
21#include "fsl_dma.h" 21#include "fsl_dma.h"
22#include "fsl_ssi.h" 22#include "fsl_ssi.h"
diff --git a/sound/soc/fsl/p1022_rdk.c b/sound/soc/fsl/p1022_rdk.c
index ee29048424be..1dd49e5f9675 100644
--- a/sound/soc/fsl/p1022_rdk.c
+++ b/sound/soc/fsl/p1022_rdk.c
@@ -18,12 +18,12 @@
18 */ 18 */
19 19
20#include <linux/module.h> 20#include <linux/module.h>
21#include <linux/fsl/guts.h>
21#include <linux/interrupt.h> 22#include <linux/interrupt.h>
22#include <linux/of_address.h> 23#include <linux/of_address.h>
23#include <linux/of_device.h> 24#include <linux/of_device.h>
24#include <linux/slab.h> 25#include <linux/slab.h>
25#include <sound/soc.h> 26#include <sound/soc.h>
26#include <asm/fsl_guts.h>
27 27
28#include "fsl_dma.h" 28#include "fsl_dma.h"
29#include "fsl_ssi.h" 29#include "fsl_ssi.h"
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-10 19:19:20 -0500