diff options
Diffstat (limited to 'arch/mips/au1000')
-rw-r--r-- | arch/mips/au1000/common/dbdma.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/common/reset.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/common/time.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/db1x00/board_setup.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/db1x00/init.c | 6 | ||||
-rw-r--r-- | arch/mips/au1000/mtx-1/board_setup.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/pb1000/board_setup.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/pb1100/board_setup.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/pb1200/board_setup.c | 8 | ||||
-rw-r--r-- | arch/mips/au1000/pb1500/board_setup.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/pb1550/board_setup.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/xxs1500/board_setup.c | 2 |
12 files changed, 17 insertions, 17 deletions
diff --git a/arch/mips/au1000/common/dbdma.c b/arch/mips/au1000/common/dbdma.c index 626de44bd888..d15b047d480d 100644 --- a/arch/mips/au1000/common/dbdma.c +++ b/arch/mips/au1000/common/dbdma.c | |||
@@ -184,7 +184,7 @@ static dbdev_tab_t dbdev_tab[] = { | |||
184 | static chan_tab_t *chan_tab_ptr[NUM_DBDMA_CHANS]; | 184 | static chan_tab_t *chan_tab_ptr[NUM_DBDMA_CHANS]; |
185 | 185 | ||
186 | static dbdev_tab_t * | 186 | static dbdev_tab_t * |
187 | find_dbdev_id (u32 id) | 187 | find_dbdev_id(u32 id) |
188 | { | 188 | { |
189 | int i; | 189 | int i; |
190 | dbdev_tab_t *p; | 190 | dbdev_tab_t *p; |
diff --git a/arch/mips/au1000/common/reset.c b/arch/mips/au1000/common/reset.c index de5447e83849..b8638d293cf9 100644 --- a/arch/mips/au1000/common/reset.c +++ b/arch/mips/au1000/common/reset.c | |||
@@ -42,7 +42,7 @@ extern void (*flush_cache_all)(void); | |||
42 | void au1000_restart(char *command) | 42 | void au1000_restart(char *command) |
43 | { | 43 | { |
44 | /* Set all integrated peripherals to disabled states */ | 44 | /* Set all integrated peripherals to disabled states */ |
45 | extern void board_reset (void); | 45 | extern void board_reset(void); |
46 | u32 prid = read_c0_prid(); | 46 | u32 prid = read_c0_prid(); |
47 | 47 | ||
48 | printk(KERN_NOTICE "\n** Resetting Integrated Peripherals\n"); | 48 | printk(KERN_NOTICE "\n** Resetting Integrated Peripherals\n"); |
diff --git a/arch/mips/au1000/common/time.c b/arch/mips/au1000/common/time.c index 726c340460b6..2556399708ba 100644 --- a/arch/mips/au1000/common/time.c +++ b/arch/mips/au1000/common/time.c | |||
@@ -200,7 +200,7 @@ unsigned long cal_r4koff(void) | |||
200 | while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_T1S); | 200 | while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_T1S); |
201 | 201 | ||
202 | while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C1S); | 202 | while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C1S); |
203 | au_writel (0, SYS_TOYWRITE); | 203 | au_writel(0, SYS_TOYWRITE); |
204 | while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C1S); | 204 | while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C1S); |
205 | 205 | ||
206 | cpu_speed = (au_readl(SYS_CPUPLL) & 0x0000003f) * | 206 | cpu_speed = (au_readl(SYS_CPUPLL) & 0x0000003f) * |
diff --git a/arch/mips/au1000/db1x00/board_setup.c b/arch/mips/au1000/db1x00/board_setup.c index 8b08edb977be..99eafeada518 100644 --- a/arch/mips/au1000/db1x00/board_setup.c +++ b/arch/mips/au1000/db1x00/board_setup.c | |||
@@ -46,7 +46,7 @@ | |||
46 | 46 | ||
47 | static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR; | 47 | static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR; |
48 | 48 | ||
49 | void board_reset (void) | 49 | void board_reset(void) |
50 | { | 50 | { |
51 | /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */ | 51 | /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */ |
52 | bcsr->swreset = 0x0000; | 52 | bcsr->swreset = 0x0000; |
diff --git a/arch/mips/au1000/db1x00/init.c b/arch/mips/au1000/db1x00/init.c index e6bdd07cc093..4d7bcfc8cf73 100644 --- a/arch/mips/au1000/db1x00/init.c +++ b/arch/mips/au1000/db1x00/init.c | |||
@@ -60,11 +60,11 @@ void __init prom_init(void) | |||
60 | prom_envp = (char **) fw_arg2; | 60 | prom_envp = (char **) fw_arg2; |
61 | 61 | ||
62 | /* Set the platform # */ | 62 | /* Set the platform # */ |
63 | #if defined (CONFIG_MIPS_DB1550) | 63 | #if defined(CONFIG_MIPS_DB1550) |
64 | mips_machtype = MACH_DB1550; | 64 | mips_machtype = MACH_DB1550; |
65 | #elif defined (CONFIG_MIPS_DB1500) | 65 | #elif defined(CONFIG_MIPS_DB1500) |
66 | mips_machtype = MACH_DB1500; | 66 | mips_machtype = MACH_DB1500; |
67 | #elif defined (CONFIG_MIPS_DB1100) | 67 | #elif defined(CONFIG_MIPS_DB1100) |
68 | mips_machtype = MACH_DB1100; | 68 | mips_machtype = MACH_DB1100; |
69 | #else | 69 | #else |
70 | mips_machtype = MACH_DB1000; | 70 | mips_machtype = MACH_DB1000; |
diff --git a/arch/mips/au1000/mtx-1/board_setup.c b/arch/mips/au1000/mtx-1/board_setup.c index 2c460c116570..abfc4bcddf7a 100644 --- a/arch/mips/au1000/mtx-1/board_setup.c +++ b/arch/mips/au1000/mtx-1/board_setup.c | |||
@@ -46,7 +46,7 @@ | |||
46 | extern int (*board_pci_idsel)(unsigned int devsel, int assert); | 46 | extern int (*board_pci_idsel)(unsigned int devsel, int assert); |
47 | int mtx1_pci_idsel(unsigned int devsel, int assert); | 47 | int mtx1_pci_idsel(unsigned int devsel, int assert); |
48 | 48 | ||
49 | void board_reset (void) | 49 | void board_reset(void) |
50 | { | 50 | { |
51 | /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */ | 51 | /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */ |
52 | au_writel(0x00000000, 0xAE00001C); | 52 | au_writel(0x00000000, 0xAE00001C); |
diff --git a/arch/mips/au1000/pb1000/board_setup.c b/arch/mips/au1000/pb1000/board_setup.c index 0aed89114bfc..5198c4f98b43 100644 --- a/arch/mips/au1000/pb1000/board_setup.c +++ b/arch/mips/au1000/pb1000/board_setup.c | |||
@@ -39,7 +39,7 @@ | |||
39 | #include <asm/mach-au1x00/au1000.h> | 39 | #include <asm/mach-au1x00/au1000.h> |
40 | #include <asm/mach-pb1x00/pb1000.h> | 40 | #include <asm/mach-pb1x00/pb1000.h> |
41 | 41 | ||
42 | void board_reset (void) | 42 | void board_reset(void) |
43 | { | 43 | { |
44 | } | 44 | } |
45 | 45 | ||
diff --git a/arch/mips/au1000/pb1100/board_setup.c b/arch/mips/au1000/pb1100/board_setup.c index 259ca05860c3..42874a6b31d1 100644 --- a/arch/mips/au1000/pb1100/board_setup.c +++ b/arch/mips/au1000/pb1100/board_setup.c | |||
@@ -39,7 +39,7 @@ | |||
39 | #include <asm/mach-au1x00/au1000.h> | 39 | #include <asm/mach-au1x00/au1000.h> |
40 | #include <asm/mach-pb1x00/pb1100.h> | 40 | #include <asm/mach-pb1x00/pb1100.h> |
41 | 41 | ||
42 | void board_reset (void) | 42 | void board_reset(void) |
43 | { | 43 | { |
44 | /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */ | 44 | /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */ |
45 | au_writel(0x00000000, 0xAE00001C); | 45 | au_writel(0x00000000, 0xAE00001C); |
diff --git a/arch/mips/au1000/pb1200/board_setup.c b/arch/mips/au1000/pb1200/board_setup.c index eea2092bde8d..2122515f79d7 100644 --- a/arch/mips/au1000/pb1200/board_setup.c +++ b/arch/mips/au1000/pb1200/board_setup.c | |||
@@ -57,7 +57,7 @@ | |||
57 | extern void _board_init_irq(void); | 57 | extern void _board_init_irq(void); |
58 | extern void (*board_init_irq)(void); | 58 | extern void (*board_init_irq)(void); |
59 | 59 | ||
60 | void board_reset (void) | 60 | void board_reset(void) |
61 | { | 61 | { |
62 | bcsr->resets = 0; | 62 | bcsr->resets = 0; |
63 | bcsr->system = 0; | 63 | bcsr->system = 0; |
@@ -148,7 +148,7 @@ void __init board_setup(void) | |||
148 | } | 148 | } |
149 | 149 | ||
150 | int | 150 | int |
151 | board_au1200fb_panel (void) | 151 | board_au1200fb_panel(void) |
152 | { | 152 | { |
153 | BCSR *bcsr = (BCSR *)BCSR_KSEG1_ADDR; | 153 | BCSR *bcsr = (BCSR *)BCSR_KSEG1_ADDR; |
154 | int p; | 154 | int p; |
@@ -160,7 +160,7 @@ board_au1200fb_panel (void) | |||
160 | } | 160 | } |
161 | 161 | ||
162 | int | 162 | int |
163 | board_au1200fb_panel_init (void) | 163 | board_au1200fb_panel_init(void) |
164 | { | 164 | { |
165 | /* Apply power */ | 165 | /* Apply power */ |
166 | BCSR *bcsr = (BCSR *)BCSR_KSEG1_ADDR; | 166 | BCSR *bcsr = (BCSR *)BCSR_KSEG1_ADDR; |
@@ -170,7 +170,7 @@ board_au1200fb_panel_init (void) | |||
170 | } | 170 | } |
171 | 171 | ||
172 | int | 172 | int |
173 | board_au1200fb_panel_shutdown (void) | 173 | board_au1200fb_panel_shutdown(void) |
174 | { | 174 | { |
175 | /* Remove power */ | 175 | /* Remove power */ |
176 | BCSR *bcsr = (BCSR *)BCSR_KSEG1_ADDR; | 176 | BCSR *bcsr = (BCSR *)BCSR_KSEG1_ADDR; |
diff --git a/arch/mips/au1000/pb1500/board_setup.c b/arch/mips/au1000/pb1500/board_setup.c index a2d850db8902..5446836869d6 100644 --- a/arch/mips/au1000/pb1500/board_setup.c +++ b/arch/mips/au1000/pb1500/board_setup.c | |||
@@ -39,7 +39,7 @@ | |||
39 | #include <asm/mach-au1x00/au1000.h> | 39 | #include <asm/mach-au1x00/au1000.h> |
40 | #include <asm/mach-pb1x00/pb1500.h> | 40 | #include <asm/mach-pb1x00/pb1500.h> |
41 | 41 | ||
42 | void board_reset (void) | 42 | void board_reset(void) |
43 | { | 43 | { |
44 | /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */ | 44 | /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */ |
45 | au_writel(0x00000000, 0xAE00001C); | 45 | au_writel(0x00000000, 0xAE00001C); |
diff --git a/arch/mips/au1000/pb1550/board_setup.c b/arch/mips/au1000/pb1550/board_setup.c index 05fd27dc24e6..e3cfb0d73180 100644 --- a/arch/mips/au1000/pb1550/board_setup.c +++ b/arch/mips/au1000/pb1550/board_setup.c | |||
@@ -44,7 +44,7 @@ | |||
44 | #include <asm/mach-au1x00/au1000.h> | 44 | #include <asm/mach-au1x00/au1000.h> |
45 | #include <asm/mach-pb1x00/pb1550.h> | 45 | #include <asm/mach-pb1x00/pb1550.h> |
46 | 46 | ||
47 | void board_reset (void) | 47 | void board_reset(void) |
48 | { | 48 | { |
49 | /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */ | 49 | /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */ |
50 | au_writew(au_readw(0xAF00001C) & ~(1<<15), 0xAF00001C); | 50 | au_writew(au_readw(0xAF00001C) & ~(1<<15), 0xAF00001C); |
diff --git a/arch/mips/au1000/xxs1500/board_setup.c b/arch/mips/au1000/xxs1500/board_setup.c index ae3d6b19e94d..a9237f41933d 100644 --- a/arch/mips/au1000/xxs1500/board_setup.c +++ b/arch/mips/au1000/xxs1500/board_setup.c | |||
@@ -39,7 +39,7 @@ | |||
39 | #include <asm/pgtable.h> | 39 | #include <asm/pgtable.h> |
40 | #include <asm/au1000.h> | 40 | #include <asm/au1000.h> |
41 | 41 | ||
42 | void board_reset (void) | 42 | void board_reset(void) |
43 | { | 43 | { |
44 | /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */ | 44 | /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */ |
45 | au_writel(0x00000000, 0xAE00001C); | 45 | au_writel(0x00000000, 0xAE00001C); |