diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2005-09-03 18:56:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:06:07 -0400 |
commit | 42a3b4f25af8f8d77feddf27f839fa0628dbff1a (patch) | |
tree | 332370ff3889fabb66a45fb5dcf605b142de77c8 /arch/mips/ddb5xxx | |
parent | 875d43e72b5bf22161a81de7554f88eccf8a51ae (diff) |
[PATCH] mips: nuke trailing whitespace
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/mips/ddb5xxx')
-rw-r--r-- | arch/mips/ddb5xxx/ddb5477/irq.c | 6 | ||||
-rw-r--r-- | arch/mips/ddb5xxx/ddb5477/setup.c | 22 |
2 files changed, 14 insertions, 14 deletions
diff --git a/arch/mips/ddb5xxx/ddb5477/irq.c b/arch/mips/ddb5xxx/ddb5477/irq.c index 5f027bfa4af8..9ffe1a9142ca 100644 --- a/arch/mips/ddb5xxx/ddb5477/irq.c +++ b/arch/mips/ddb5xxx/ddb5477/irq.c | |||
@@ -76,7 +76,7 @@ set_pci_int_attr(u32 pci, u32 intn, u32 active, u32 trigger) | |||
76 | extern void vrc5477_irq_init(u32 base); | 76 | extern void vrc5477_irq_init(u32 base); |
77 | extern void mips_cpu_irq_init(u32 base); | 77 | extern void mips_cpu_irq_init(u32 base); |
78 | extern asmlinkage void ddb5477_handle_int(void); | 78 | extern asmlinkage void ddb5477_handle_int(void); |
79 | extern int setup_irq(unsigned int irq, struct irqaction *irqaction); | 79 | extern int setup_irq(unsigned int irq, struct irqaction *irqaction); |
80 | static struct irqaction irq_cascade = { no_action, 0, CPU_MASK_NONE, "cascade", NULL, NULL }; | 80 | static struct irqaction irq_cascade = { no_action, 0, CPU_MASK_NONE, "cascade", NULL, NULL }; |
81 | 81 | ||
82 | void __init arch_init_irq(void) | 82 | void __init arch_init_irq(void) |
@@ -94,7 +94,7 @@ void __init arch_init_irq(void) | |||
94 | /* setup PCI interrupt attributes */ | 94 | /* setup PCI interrupt attributes */ |
95 | set_pci_int_attr(PCI0, INTA, ACTIVE_LOW, LEVEL_SENSE); | 95 | set_pci_int_attr(PCI0, INTA, ACTIVE_LOW, LEVEL_SENSE); |
96 | set_pci_int_attr(PCI0, INTB, ACTIVE_LOW, LEVEL_SENSE); | 96 | set_pci_int_attr(PCI0, INTB, ACTIVE_LOW, LEVEL_SENSE); |
97 | if (mips_machtype == MACH_NEC_ROCKHOPPERII) | 97 | if (mips_machtype == MACH_NEC_ROCKHOPPERII) |
98 | set_pci_int_attr(PCI0, INTC, ACTIVE_HIGH, LEVEL_SENSE); | 98 | set_pci_int_attr(PCI0, INTC, ACTIVE_HIGH, LEVEL_SENSE); |
99 | else | 99 | else |
100 | set_pci_int_attr(PCI0, INTC, ACTIVE_LOW, LEVEL_SENSE); | 100 | set_pci_int_attr(PCI0, INTC, ACTIVE_LOW, LEVEL_SENSE); |
@@ -134,7 +134,7 @@ void __init arch_init_irq(void) | |||
134 | 134 | ||
135 | /* setup cascade interrupts */ | 135 | /* setup cascade interrupts */ |
136 | setup_irq(VRC5477_IRQ_BASE + VRC5477_I8259_CASCADE, &irq_cascade); | 136 | setup_irq(VRC5477_IRQ_BASE + VRC5477_I8259_CASCADE, &irq_cascade); |
137 | setup_irq(CPU_IRQ_BASE + CPU_VRC5477_CASCADE, &irq_cascade); | 137 | setup_irq(CPU_IRQ_BASE + CPU_VRC5477_CASCADE, &irq_cascade); |
138 | 138 | ||
139 | /* hook up the first-level interrupt handler */ | 139 | /* hook up the first-level interrupt handler */ |
140 | set_except_vector(0, ddb5477_handle_int); | 140 | set_except_vector(0, ddb5477_handle_int); |
diff --git a/arch/mips/ddb5xxx/ddb5477/setup.c b/arch/mips/ddb5xxx/ddb5477/setup.c index 15c6e543b56f..d62f5a789b05 100644 --- a/arch/mips/ddb5xxx/ddb5477/setup.c +++ b/arch/mips/ddb5xxx/ddb5477/setup.c | |||
@@ -141,7 +141,7 @@ static void __init ddb_time_init(void) | |||
141 | 141 | ||
142 | /* mips_hpt_frequency is 1/2 of the cpu core freq */ | 142 | /* mips_hpt_frequency is 1/2 of the cpu core freq */ |
143 | i = (read_c0_config() >> 28 ) & 7; | 143 | i = (read_c0_config() >> 28 ) & 7; |
144 | if ((current_cpu_data.cputype == CPU_R5432) && (i == 3)) | 144 | if ((current_cpu_data.cputype == CPU_R5432) && (i == 3)) |
145 | i = 4; | 145 | i = 4; |
146 | mips_hpt_frequency = bus_frequency*(i+4)/4; | 146 | mips_hpt_frequency = bus_frequency*(i+4)/4; |
147 | } | 147 | } |
@@ -298,11 +298,11 @@ static void __init ddb5477_board_init(void) | |||
298 | 298 | ||
299 | if (mips_machtype == MACH_NEC_ROCKHOPPER | 299 | if (mips_machtype == MACH_NEC_ROCKHOPPER |
300 | || mips_machtype == MACH_NEC_ROCKHOPPERII) { | 300 | || mips_machtype == MACH_NEC_ROCKHOPPERII) { |
301 | /* Disable bus diagnostics. */ | 301 | /* Disable bus diagnostics. */ |
302 | ddb_out32(DDB_PCICTL0_L, 0); | 302 | ddb_out32(DDB_PCICTL0_L, 0); |
303 | ddb_out32(DDB_PCICTL0_H, 0); | 303 | ddb_out32(DDB_PCICTL0_H, 0); |
304 | ddb_out32(DDB_PCICTL1_L, 0); | 304 | ddb_out32(DDB_PCICTL1_L, 0); |
305 | ddb_out32(DDB_PCICTL1_H, 0); | 305 | ddb_out32(DDB_PCICTL1_H, 0); |
306 | } | 306 | } |
307 | 307 | ||
308 | if (mips_machtype == MACH_NEC_ROCKHOPPER) { | 308 | if (mips_machtype == MACH_NEC_ROCKHOPPER) { |
@@ -354,7 +354,7 @@ static void __init ddb5477_board_init(void) | |||
354 | */ | 354 | */ |
355 | pci_write_config_byte(&dev_m1533, 0x58, 0x74); | 355 | pci_write_config_byte(&dev_m1533, 0x58, 0x74); |
356 | 356 | ||
357 | /* | 357 | /* |
358 | * positive decode (bit6 -0) | 358 | * positive decode (bit6 -0) |
359 | * enable IDE controler interrupt (bit 4 -1) | 359 | * enable IDE controler interrupt (bit 4 -1) |
360 | * setup SIRQ to point to IRQ 14 (bit 3:0 - 1101) | 360 | * setup SIRQ to point to IRQ 14 (bit 3:0 - 1101) |
@@ -364,31 +364,31 @@ static void __init ddb5477_board_init(void) | |||
364 | /* Setup M5229 registers */ | 364 | /* Setup M5229 registers */ |
365 | dev_m5229.bus = &bus; | 365 | dev_m5229.bus = &bus; |
366 | dev_m5229.sysdata = NULL; | 366 | dev_m5229.sysdata = NULL; |
367 | dev_m5229.devfn = 4*8; // slot 4 (AD15): M5229 IDE | 367 | dev_m5229.devfn = 4*8; // slot 4 (AD15): M5229 IDE |
368 | 368 | ||
369 | /* | 369 | /* |
370 | * enable IDE in the M5229 config register 0x50 (bit 0 - 1) | 370 | * enable IDE in the M5229 config register 0x50 (bit 0 - 1) |
371 | * M5229 IDSEL is addr:15; see above setting | 371 | * M5229 IDSEL is addr:15; see above setting |
372 | */ | 372 | */ |
373 | pci_read_config_byte(&dev_m5229, 0x50, &temp8); | 373 | pci_read_config_byte(&dev_m5229, 0x50, &temp8); |
374 | pci_write_config_byte(&dev_m5229, 0x50, temp8 | 0x1); | 374 | pci_write_config_byte(&dev_m5229, 0x50, temp8 | 0x1); |
375 | 375 | ||
376 | /* | 376 | /* |
377 | * enable bus master (bit 2) and IO decoding (bit 0) | 377 | * enable bus master (bit 2) and IO decoding (bit 0) |
378 | */ | 378 | */ |
379 | pci_read_config_byte(&dev_m5229, 0x04, &temp8); | 379 | pci_read_config_byte(&dev_m5229, 0x04, &temp8); |
380 | pci_write_config_byte(&dev_m5229, 0x04, temp8 | 0x5); | 380 | pci_write_config_byte(&dev_m5229, 0x04, temp8 | 0x5); |
381 | 381 | ||
382 | /* | 382 | /* |
383 | * enable native, copied from arch/ppc/k2boot/head.S | 383 | * enable native, copied from arch/ppc/k2boot/head.S |
384 | * TODO - need volatile, need to be portable | 384 | * TODO - need volatile, need to be portable |
385 | */ | 385 | */ |
386 | pci_write_config_byte(&dev_m5229, 0x09, 0xef); | 386 | pci_write_config_byte(&dev_m5229, 0x09, 0xef); |
387 | 387 | ||
388 | /* Set Primary Channel Command Block Timing */ | 388 | /* Set Primary Channel Command Block Timing */ |
389 | pci_write_config_byte(&dev_m5229, 0x59, 0x31); | 389 | pci_write_config_byte(&dev_m5229, 0x59, 0x31); |
390 | 390 | ||
391 | /* | 391 | /* |
392 | * Enable primary channel 40-pin cable | 392 | * Enable primary channel 40-pin cable |
393 | * M5229 register 0x4a (bit 0) | 393 | * M5229 register 0x4a (bit 0) |
394 | */ | 394 | */ |