diff options
Diffstat (limited to 'arch/mips/au1000/common')
-rw-r--r-- | arch/mips/au1000/common/cputable.c | 5 | ||||
-rw-r--r-- | arch/mips/au1000/common/dbdma.c | 6 | ||||
-rw-r--r-- | arch/mips/au1000/common/dbg_io.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/common/dma.c | 5 | ||||
-rw-r--r-- | arch/mips/au1000/common/gpio.c | 5 | ||||
-rw-r--r-- | arch/mips/au1000/common/irq.c | 1 | ||||
-rw-r--r-- | arch/mips/au1000/common/pci.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/common/platform.c | 4 | ||||
-rw-r--r-- | arch/mips/au1000/common/power.c | 9 | ||||
-rw-r--r-- | arch/mips/au1000/common/prom.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/common/puts.c | 1 | ||||
-rw-r--r-- | arch/mips/au1000/common/reset.c | 8 | ||||
-rw-r--r-- | arch/mips/au1000/common/setup.c | 11 | ||||
-rw-r--r-- | arch/mips/au1000/common/sleeper.S | 2 | ||||
-rw-r--r-- | arch/mips/au1000/common/time.c | 8 |
15 files changed, 9 insertions, 62 deletions
diff --git a/arch/mips/au1000/common/cputable.c b/arch/mips/au1000/common/cputable.c index 5c0d35d6e22a..8c93a05d7382 100644 --- a/arch/mips/au1000/common/cputable.c +++ b/arch/mips/au1000/common/cputable.c | |||
@@ -11,10 +11,7 @@ | |||
11 | * as published by the Free Software Foundation; either version | 11 | * as published by the Free Software Foundation; either version |
12 | * 2 of the License, or (at your option) any later version. | 12 | * 2 of the License, or (at your option) any later version. |
13 | */ | 13 | */ |
14 | #include <linux/string.h> | 14 | |
15 | #include <linux/sched.h> | ||
16 | #include <linux/threads.h> | ||
17 | #include <linux/init.h> | ||
18 | #include <asm/mach-au1x00/au1000.h> | 15 | #include <asm/mach-au1x00/au1000.h> |
19 | 16 | ||
20 | struct cpu_spec* cur_cpu_spec[NR_CPUS]; | 17 | struct cpu_spec* cur_cpu_spec[NR_CPUS]; |
diff --git a/arch/mips/au1000/common/dbdma.c b/arch/mips/au1000/common/dbdma.c index 57f17b41098d..53377dfc0640 100644 --- a/arch/mips/au1000/common/dbdma.c +++ b/arch/mips/au1000/common/dbdma.c | |||
@@ -31,18 +31,12 @@ | |||
31 | */ | 31 | */ |
32 | 32 | ||
33 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
34 | #include <linux/errno.h> | ||
35 | #include <linux/sched.h> | ||
36 | #include <linux/slab.h> | 34 | #include <linux/slab.h> |
37 | #include <linux/spinlock.h> | 35 | #include <linux/spinlock.h> |
38 | #include <linux/string.h> | ||
39 | #include <linux/delay.h> | ||
40 | #include <linux/interrupt.h> | 36 | #include <linux/interrupt.h> |
41 | #include <linux/module.h> | 37 | #include <linux/module.h> |
42 | #include <asm/mach-au1x00/au1000.h> | 38 | #include <asm/mach-au1x00/au1000.h> |
43 | #include <asm/mach-au1x00/au1xxx_dbdma.h> | 39 | #include <asm/mach-au1x00/au1xxx_dbdma.h> |
44 | #include <asm/system.h> | ||
45 | |||
46 | 40 | ||
47 | #if defined(CONFIG_SOC_AU1550) || defined(CONFIG_SOC_AU1200) | 41 | #if defined(CONFIG_SOC_AU1550) || defined(CONFIG_SOC_AU1200) |
48 | 42 | ||
diff --git a/arch/mips/au1000/common/dbg_io.c b/arch/mips/au1000/common/dbg_io.c index 12f5458142ae..eae1bb2ca26e 100644 --- a/arch/mips/au1000/common/dbg_io.c +++ b/arch/mips/au1000/common/dbg_io.c | |||
@@ -1,5 +1,4 @@ | |||
1 | 1 | ||
2 | #include <asm/io.h> | ||
3 | #include <asm/mach-au1x00/au1000.h> | 2 | #include <asm/mach-au1x00/au1000.h> |
4 | 3 | ||
5 | #ifdef CONFIG_KGDB | 4 | #ifdef CONFIG_KGDB |
@@ -55,7 +54,6 @@ typedef unsigned int uint32; | |||
55 | #define UART16550_READ(y) (au_readl(DEBUG_BASE + y) & 0xff) | 54 | #define UART16550_READ(y) (au_readl(DEBUG_BASE + y) & 0xff) |
56 | #define UART16550_WRITE(y, z) (au_writel(z&0xff, DEBUG_BASE + y)) | 55 | #define UART16550_WRITE(y, z) (au_writel(z&0xff, DEBUG_BASE + y)) |
57 | 56 | ||
58 | extern unsigned long get_au1x00_uart_baud_base(void); | ||
59 | extern unsigned long calc_clock(void); | 57 | extern unsigned long calc_clock(void); |
60 | 58 | ||
61 | void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop) | 59 | void debugInit(uint32 baud, uint8 data, uint8 parity, uint8 stop) |
diff --git a/arch/mips/au1000/common/dma.c b/arch/mips/au1000/common/dma.c index c78260d4e837..95f69ea146e9 100644 --- a/arch/mips/au1000/common/dma.c +++ b/arch/mips/au1000/common/dma.c | |||
@@ -33,12 +33,9 @@ | |||
33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
34 | #include <linux/kernel.h> | 34 | #include <linux/kernel.h> |
35 | #include <linux/errno.h> | 35 | #include <linux/errno.h> |
36 | #include <linux/sched.h> | ||
37 | #include <linux/spinlock.h> | 36 | #include <linux/spinlock.h> |
38 | #include <linux/string.h> | ||
39 | #include <linux/delay.h> | ||
40 | #include <linux/interrupt.h> | 37 | #include <linux/interrupt.h> |
41 | #include <asm/system.h> | 38 | |
42 | #include <asm/mach-au1x00/au1000.h> | 39 | #include <asm/mach-au1x00/au1000.h> |
43 | #include <asm/mach-au1x00/au1000_dma.h> | 40 | #include <asm/mach-au1x00/au1000_dma.h> |
44 | 41 | ||
diff --git a/arch/mips/au1000/common/gpio.c b/arch/mips/au1000/common/gpio.c index 0b658f1db4ce..525452589971 100644 --- a/arch/mips/au1000/common/gpio.c +++ b/arch/mips/au1000/common/gpio.c | |||
@@ -27,13 +27,8 @@ | |||
27 | * others have a second one : GPIO2 | 27 | * others have a second one : GPIO2 |
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include <linux/init.h> | ||
31 | #include <linux/io.h> | ||
32 | #include <linux/types.h> | ||
33 | #include <linux/module.h> | 30 | #include <linux/module.h> |
34 | 31 | ||
35 | #include <asm/addrspace.h> | ||
36 | |||
37 | #include <asm/mach-au1x00/au1000.h> | 32 | #include <asm/mach-au1x00/au1000.h> |
38 | #include <asm/gpio.h> | 33 | #include <asm/gpio.h> |
39 | 34 | ||
diff --git a/arch/mips/au1000/common/irq.c b/arch/mips/au1000/common/irq.c index 5528e1412b50..f0626992fd75 100644 --- a/arch/mips/au1000/common/irq.c +++ b/arch/mips/au1000/common/irq.c | |||
@@ -26,7 +26,6 @@ | |||
26 | */ | 26 | */ |
27 | #include <linux/bitops.h> | 27 | #include <linux/bitops.h> |
28 | #include <linux/init.h> | 28 | #include <linux/init.h> |
29 | #include <linux/io.h> | ||
30 | #include <linux/interrupt.h> | 29 | #include <linux/interrupt.h> |
31 | #include <linux/irq.h> | 30 | #include <linux/irq.h> |
32 | 31 | ||
diff --git a/arch/mips/au1000/common/pci.c b/arch/mips/au1000/common/pci.c index ce771487567d..7e966b31e3e1 100644 --- a/arch/mips/au1000/common/pci.c +++ b/arch/mips/au1000/common/pci.c | |||
@@ -30,7 +30,7 @@ | |||
30 | * with this program; if not, write to the Free Software Foundation, Inc., | 30 | * with this program; if not, write to the Free Software Foundation, Inc., |
31 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 31 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
32 | */ | 32 | */ |
33 | #include <linux/types.h> | 33 | |
34 | #include <linux/pci.h> | 34 | #include <linux/pci.h> |
35 | #include <linux/kernel.h> | 35 | #include <linux/kernel.h> |
36 | #include <linux/init.h> | 36 | #include <linux/init.h> |
diff --git a/arch/mips/au1000/common/platform.c b/arch/mips/au1000/common/platform.c index 39d681265297..c1c860c6a6e1 100644 --- a/arch/mips/au1000/common/platform.c +++ b/arch/mips/au1000/common/platform.c | |||
@@ -7,11 +7,9 @@ | |||
7 | * License version 2. This program is licensed "as is" without any | 7 | * License version 2. This program is licensed "as is" without any |
8 | * warranty of any kind, whether express or implied. | 8 | * warranty of any kind, whether express or implied. |
9 | */ | 9 | */ |
10 | #include <linux/device.h> | 10 | |
11 | #include <linux/platform_device.h> | 11 | #include <linux/platform_device.h> |
12 | #include <linux/kernel.h> | ||
13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
14 | #include <linux/resource.h> | ||
15 | 13 | ||
16 | #include <asm/mach-au1x00/au1xxx.h> | 14 | #include <asm/mach-au1x00/au1xxx.h> |
17 | 15 | ||
diff --git a/arch/mips/au1000/common/power.c b/arch/mips/au1000/common/power.c index ca4b3dea3c92..812a5f8b7d26 100644 --- a/arch/mips/au1000/common/power.c +++ b/arch/mips/au1000/common/power.c | |||
@@ -29,17 +29,14 @@ | |||
29 | * with this program; if not, write to the Free Software Foundation, Inc., | 29 | * with this program; if not, write to the Free Software Foundation, Inc., |
30 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 30 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
31 | */ | 31 | */ |
32 | |||
32 | #include <linux/init.h> | 33 | #include <linux/init.h> |
33 | #include <linux/pm.h> | 34 | #include <linux/pm.h> |
34 | #include <linux/pm_legacy.h> | 35 | #include <linux/pm_legacy.h> |
35 | #include <linux/slab.h> | ||
36 | #include <linux/sysctl.h> | 36 | #include <linux/sysctl.h> |
37 | #include <linux/jiffies.h> | 37 | #include <linux/jiffies.h> |
38 | 38 | ||
39 | #include <asm/string.h> | ||
40 | #include <asm/uaccess.h> | 39 | #include <asm/uaccess.h> |
41 | #include <asm/io.h> | ||
42 | #include <asm/system.h> | ||
43 | #include <asm/cacheflush.h> | 40 | #include <asm/cacheflush.h> |
44 | #include <asm/mach-au1x00/au1000.h> | 41 | #include <asm/mach-au1x00/au1000.h> |
45 | 42 | ||
@@ -54,10 +51,6 @@ | |||
54 | 51 | ||
55 | static void au1000_calibrate_delay(void); | 52 | static void au1000_calibrate_delay(void); |
56 | 53 | ||
57 | extern void set_au1x00_speed(unsigned int new_freq); | ||
58 | extern unsigned int get_au1x00_speed(void); | ||
59 | extern unsigned long get_au1x00_uart_baud_base(void); | ||
60 | extern void set_au1x00_uart_baud_base(unsigned long new_baud_base); | ||
61 | extern unsigned long save_local_and_disable(int controller); | 54 | extern unsigned long save_local_and_disable(int controller); |
62 | extern void restore_local_and_enable(int controller, unsigned long mask); | 55 | extern void restore_local_and_enable(int controller, unsigned long mask); |
63 | extern void local_enable_irq(unsigned int irq_nr); | 56 | extern void local_enable_irq(unsigned int irq_nr); |
diff --git a/arch/mips/au1000/common/prom.c b/arch/mips/au1000/common/prom.c index 90d70695aa60..f10af829e4ec 100644 --- a/arch/mips/au1000/common/prom.c +++ b/arch/mips/au1000/common/prom.c | |||
@@ -33,8 +33,8 @@ | |||
33 | * with this program; if not, write to the Free Software Foundation, Inc., | 33 | * with this program; if not, write to the Free Software Foundation, Inc., |
34 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 34 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
35 | */ | 35 | */ |
36 | |||
36 | #include <linux/module.h> | 37 | #include <linux/module.h> |
37 | #include <linux/kernel.h> | ||
38 | #include <linux/init.h> | 38 | #include <linux/init.h> |
39 | #include <linux/string.h> | 39 | #include <linux/string.h> |
40 | 40 | ||
diff --git a/arch/mips/au1000/common/puts.c b/arch/mips/au1000/common/puts.c index 2705829cd466..e34c67e89293 100644 --- a/arch/mips/au1000/common/puts.c +++ b/arch/mips/au1000/common/puts.c | |||
@@ -28,7 +28,6 @@ | |||
28 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 28 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <linux/types.h> | ||
32 | #include <asm/mach-au1x00/au1000.h> | 31 | #include <asm/mach-au1x00/au1000.h> |
33 | 32 | ||
34 | #define SERIAL_BASE UART_BASE | 33 | #define SERIAL_BASE UART_BASE |
diff --git a/arch/mips/au1000/common/reset.c b/arch/mips/au1000/common/reset.c index b8638d293cf9..60cec537c745 100644 --- a/arch/mips/au1000/common/reset.c +++ b/arch/mips/au1000/common/reset.c | |||
@@ -27,13 +27,7 @@ | |||
27 | * with this program; if not, write to the Free Software Foundation, Inc., | 27 | * with this program; if not, write to the Free Software Foundation, Inc., |
28 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 28 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
29 | */ | 29 | */ |
30 | #include <linux/sched.h> | 30 | |
31 | #include <linux/mm.h> | ||
32 | #include <asm/io.h> | ||
33 | #include <asm/pgtable.h> | ||
34 | #include <asm/processor.h> | ||
35 | #include <asm/reboot.h> | ||
36 | #include <asm/system.h> | ||
37 | #include <asm/mach-au1x00/au1000.h> | 31 | #include <asm/mach-au1x00/au1000.h> |
38 | 32 | ||
39 | extern int au_sleep(void); | 33 | extern int au_sleep(void); |
diff --git a/arch/mips/au1000/common/setup.c b/arch/mips/au1000/common/setup.c index 9e4ab80caab6..0e86f7a6b4a7 100644 --- a/arch/mips/au1000/common/setup.c +++ b/arch/mips/au1000/common/setup.c | |||
@@ -25,21 +25,14 @@ | |||
25 | * with this program; if not, write to the Free Software Foundation, Inc., | 25 | * with this program; if not, write to the Free Software Foundation, Inc., |
26 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 26 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
27 | */ | 27 | */ |
28 | |||
28 | #include <linux/init.h> | 29 | #include <linux/init.h> |
29 | #include <linux/sched.h> | ||
30 | #include <linux/ioport.h> | 30 | #include <linux/ioport.h> |
31 | #include <linux/mm.h> | ||
32 | #include <linux/delay.h> | ||
33 | #include <linux/interrupt.h> | ||
34 | #include <linux/module.h> | 31 | #include <linux/module.h> |
35 | #include <linux/pm.h> | 32 | #include <linux/pm.h> |
36 | 33 | ||
37 | #include <asm/cpu.h> | ||
38 | #include <asm/bootinfo.h> | ||
39 | #include <asm/irq.h> | ||
40 | #include <asm/mipsregs.h> | 34 | #include <asm/mipsregs.h> |
41 | #include <asm/reboot.h> | 35 | #include <asm/reboot.h> |
42 | #include <asm/pgtable.h> | ||
43 | #include <asm/time.h> | 36 | #include <asm/time.h> |
44 | 37 | ||
45 | #include <au1000.h> | 38 | #include <au1000.h> |
@@ -49,8 +42,6 @@ extern void __init board_setup(void); | |||
49 | extern void au1000_restart(char *); | 42 | extern void au1000_restart(char *); |
50 | extern void au1000_halt(void); | 43 | extern void au1000_halt(void); |
51 | extern void au1000_power_off(void); | 44 | extern void au1000_power_off(void); |
52 | extern void au1x_time_init(void); | ||
53 | extern void au1x_timer_setup(struct irqaction *irq); | ||
54 | extern void set_cpuspec(void); | 45 | extern void set_cpuspec(void); |
55 | 46 | ||
56 | void __init plat_mem_setup(void) | 47 | void __init plat_mem_setup(void) |
diff --git a/arch/mips/au1000/common/sleeper.S b/arch/mips/au1000/common/sleeper.S index 683d9da84b66..4b3cf021a454 100644 --- a/arch/mips/au1000/common/sleeper.S +++ b/arch/mips/au1000/common/sleeper.S | |||
@@ -9,9 +9,9 @@ | |||
9 | * Free Software Foundation; either version 2 of the License, or (at your | 9 | * Free Software Foundation; either version 2 of the License, or (at your |
10 | * option) any later version. | 10 | * option) any later version. |
11 | */ | 11 | */ |
12 | |||
12 | #include <asm/asm.h> | 13 | #include <asm/asm.h> |
13 | #include <asm/mipsregs.h> | 14 | #include <asm/mipsregs.h> |
14 | #include <asm/addrspace.h> | ||
15 | #include <asm/regdef.h> | 15 | #include <asm/regdef.h> |
16 | #include <asm/stackframe.h> | 16 | #include <asm/stackframe.h> |
17 | 17 | ||
diff --git a/arch/mips/au1000/common/time.c b/arch/mips/au1000/common/time.c index 57aea3164d9a..bdb6d73b26fb 100644 --- a/arch/mips/au1000/common/time.c +++ b/arch/mips/au1000/common/time.c | |||
@@ -34,20 +34,12 @@ | |||
34 | 34 | ||
35 | #include <linux/types.h> | 35 | #include <linux/types.h> |
36 | #include <linux/init.h> | 36 | #include <linux/init.h> |
37 | #include <linux/kernel_stat.h> | ||
38 | #include <linux/sched.h> | ||
39 | #include <linux/spinlock.h> | 37 | #include <linux/spinlock.h> |
40 | #include <linux/hardirq.h> | ||
41 | 38 | ||
42 | #include <asm/compiler.h> | ||
43 | #include <asm/mipsregs.h> | 39 | #include <asm/mipsregs.h> |
44 | #include <asm/time.h> | 40 | #include <asm/time.h> |
45 | #include <asm/div64.h> | ||
46 | #include <asm/mach-au1x00/au1000.h> | 41 | #include <asm/mach-au1x00/au1000.h> |
47 | 42 | ||
48 | #include <linux/mc146818rtc.h> | ||
49 | #include <linux/timex.h> | ||
50 | |||
51 | static int no_au1xxx_32khz; | 43 | static int no_au1xxx_32khz; |
52 | extern int allow_au1k_wait; /* default off for CP0 Counter */ | 44 | extern int allow_au1k_wait; /* default off for CP0 Counter */ |
53 | 45 | ||