Commit a3dddd56 authored by Ralf Baechle's avatar Ralf Baechle

[MIPS] War on whitespace: cleanup initial spaces followed by tabs.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 59b3e8e9
...@@ -214,7 +214,7 @@ au1xxx_ddma_add_device(dbdev_tab_t *dev) ...@@ -214,7 +214,7 @@ au1xxx_ddma_add_device(dbdev_tab_t *dev)
if ( NULL != p ) if ( NULL != p )
{ {
memcpy(p, dev, sizeof(dbdev_tab_t)); memcpy(p, dev, sizeof(dbdev_tab_t));
p->dev_id = DSCR_DEV2CUSTOM_ID(new_id,dev->dev_id); p->dev_id = DSCR_DEV2CUSTOM_ID(new_id,dev->dev_id);
ret = p->dev_id; ret = p->dev_id;
new_id++; new_id++;
#if 0 #if 0
...@@ -260,7 +260,7 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid, ...@@ -260,7 +260,7 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
spin_lock_irqsave(&au1xxx_dbdma_spin_lock, flags); spin_lock_irqsave(&au1xxx_dbdma_spin_lock, flags);
if (!(stp->dev_flags & DEV_FLAGS_INUSE) || if (!(stp->dev_flags & DEV_FLAGS_INUSE) ||
(stp->dev_flags & DEV_FLAGS_ANYUSE)) { (stp->dev_flags & DEV_FLAGS_ANYUSE)) {
/* Got source */ /* Got source */
stp->dev_flags |= DEV_FLAGS_INUSE; stp->dev_flags |= DEV_FLAGS_INUSE;
if (!(dtp->dev_flags & DEV_FLAGS_INUSE) || if (!(dtp->dev_flags & DEV_FLAGS_INUSE) ||
(dtp->dev_flags & DEV_FLAGS_ANYUSE)) { (dtp->dev_flags & DEV_FLAGS_ANYUSE)) {
......
...@@ -174,7 +174,7 @@ int request_au1000_dma(int dev_id, const char *dev_str, ...@@ -174,7 +174,7 @@ int request_au1000_dma(int dev_id, const char *dev_str,
return -EINVAL; return -EINVAL;
#else #else
if (dev_id < 0 || dev_id >= DMA_NUM_DEV) if (dev_id < 0 || dev_id >= DMA_NUM_DEV)
return -EINVAL; return -EINVAL;
#endif #endif
for (i = 0; i < NUM_AU1000_DMA_CHANNELS; i++) { for (i = 0; i < NUM_AU1000_DMA_CHANNELS; i++) {
......
...@@ -264,7 +264,7 @@ static struct resource smc91x_resources[] = { ...@@ -264,7 +264,7 @@ static struct resource smc91x_resources[] = {
static struct platform_device smc91x_device = { static struct platform_device smc91x_device = {
.name = "smc91x", .name = "smc91x",
.id = -1, .id = -1,
.num_resources = ARRAY_SIZE(smc91x_resources), .num_resources = ARRAY_SIZE(smc91x_resources),
.resource = smc91x_resources, .resource = smc91x_resources,
}; };
...@@ -288,7 +288,7 @@ static struct platform_device *au1xxx_platform_devices[] __initdata = { ...@@ -288,7 +288,7 @@ static struct platform_device *au1xxx_platform_devices[] __initdata = {
&au1xxx_mmc_device, &au1xxx_mmc_device,
#endif #endif
#ifdef CONFIG_MIPS_DB1200 #ifdef CONFIG_MIPS_DB1200
&smc91x_device, &smc91x_device,
#endif #endif
}; };
......
...@@ -90,7 +90,7 @@ void __init plat_setup(void) ...@@ -90,7 +90,7 @@ void __init plat_setup(void)
else { else {
/* Clear to obtain best system bus performance */ /* Clear to obtain best system bus performance */
clear_c0_config(1<<19); /* Clear Config[OD] */ clear_c0_config(1<<19); /* Clear Config[OD] */
} }
argptr = prom_getcmdline(); argptr = prom_getcmdline();
......
...@@ -359,7 +359,7 @@ static unsigned long do_fast_cp0_gettimeoffset(void) ...@@ -359,7 +359,7 @@ static unsigned long do_fast_cp0_gettimeoffset(void)
: "hi", "lo", GCC_REG_ACCUM); : "hi", "lo", GCC_REG_ACCUM);
/* /*
* Due to possible jiffies inconsistencies, we need to check * Due to possible jiffies inconsistencies, we need to check
* the result so that we'll get a timer that is monotonic. * the result so that we'll get a timer that is monotonic.
*/ */
if (res >= USECS_PER_JIFFY) if (res >= USECS_PER_JIFFY)
......
...@@ -45,7 +45,7 @@ static inline void pmax_setup_memory_region(void) ...@@ -45,7 +45,7 @@ static inline void pmax_setup_memory_region(void)
*/ */
for (memory_page = (unsigned char *)CKSEG1 + CHUNK_SIZE; for (memory_page = (unsigned char *)CKSEG1 + CHUNK_SIZE;
mem_err == 0 && memory_page < (unsigned char *)CKSEG1 + 0x1e00000; mem_err == 0 && memory_page < (unsigned char *)CKSEG1 + 0x1e00000;
memory_page += CHUNK_SIZE) { memory_page += CHUNK_SIZE) {
dummy = *memory_page; dummy = *memory_page;
} }
memcpy((void *)(CKSEG0 + 0x80), &old_handler, 0x80); memcpy((void *)(CKSEG0 + 0x80), &old_handler, 0x80);
......
...@@ -248,17 +248,17 @@ loc_call: /* ...@@ -248,17 +248,17 @@ loc_call: /*
and t2,s1 and t2,s1
sh t2,JAZZ_IO_IRQ_ENABLE sh t2,JAZZ_IO_IRQ_ENABLE
nor s1,zero,s1 nor s1,zero,s1
jal do_IRQ jal do_IRQ
/* /*
* Reenable interrupt * Reenable interrupt
*/ */
lhu t2,JAZZ_IO_IRQ_ENABLE lhu t2,JAZZ_IO_IRQ_ENABLE
or t2,s1 or t2,s1
sh t2,JAZZ_IO_IRQ_ENABLE sh t2,JAZZ_IO_IRQ_ENABLE
j ret_from_irq j ret_from_irq
/* /*
* "Jump extender" to reach spurious_interrupt * "Jump extender" to reach spurious_interrupt
......
...@@ -291,7 +291,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c) ...@@ -291,7 +291,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
* for documentation. Commented out because it shares * for documentation. Commented out because it shares
* it's c0_prid id number with the TX3900. * it's c0_prid id number with the TX3900.
*/ */
c->cputype = CPU_R4650; c->cputype = CPU_R4650;
c->isa_level = MIPS_CPU_ISA_III; c->isa_level = MIPS_CPU_ISA_III;
c->options = R4K_OPTS | MIPS_CPU_FPU | MIPS_CPU_LLSC; c->options = R4K_OPTS | MIPS_CPU_FPU | MIPS_CPU_LLSC;
c->tlbsize = 48; c->tlbsize = 48;
...@@ -604,7 +604,7 @@ static inline void cpu_probe_alchemy(struct cpuinfo_mips *c) ...@@ -604,7 +604,7 @@ static inline void cpu_probe_alchemy(struct cpuinfo_mips *c)
case PRID_IMP_AU1_REV2: case PRID_IMP_AU1_REV2:
switch ((c->processor_id >> 24) & 0xff) { switch ((c->processor_id >> 24) & 0xff) {
case 0: case 0:
c->cputype = CPU_AU1000; c->cputype = CPU_AU1000;
break; break;
case 1: case 1:
c->cputype = CPU_AU1500; c->cputype = CPU_AU1500;
...@@ -705,7 +705,7 @@ __init void cpu_probe(void) ...@@ -705,7 +705,7 @@ __init void cpu_probe(void)
break; break;
case PRID_COMP_PHILIPS: case PRID_COMP_PHILIPS:
cpu_probe_philips(c); cpu_probe_philips(c);
break; break;
default: default:
c->cputype = CPU_UNKNOWN; c->cputype = CPU_UNKNOWN;
} }
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
*/ */
.align 5 .align 5
NESTED(trap_low, GDB_FR_SIZE, sp) NESTED(trap_low, GDB_FR_SIZE, sp)
.set noat .set noat
.set noreorder .set noreorder
mfc0 k0, CP0_STATUS mfc0 k0, CP0_STATUS
......
...@@ -166,11 +166,11 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size) ...@@ -166,11 +166,11 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)
sp = regs->regs[29]; sp = regs->regs[29];
/* /*
* FPU emulator may have it's own trampoline active just * FPU emulator may have it's own trampoline active just
* above the user stack, 16-bytes before the next lowest * above the user stack, 16-bytes before the next lowest
* 16 byte boundary. Try to avoid trashing it. * 16 byte boundary. Try to avoid trashing it.
*/ */
sp -= 32; sp -= 32;
/* This is the X/Open sanctioned signal stack switching. */ /* This is the X/Open sanctioned signal stack switching. */
if ((ka->sa.sa_flags & SA_ONSTACK) && (sas_ss_flags (sp) == 0)) if ((ka->sa.sa_flags & SA_ONSTACK) && (sas_ss_flags (sp) == 0))
......
...@@ -624,11 +624,11 @@ static inline void __user *get_sigframe(struct k_sigaction *ka, ...@@ -624,11 +624,11 @@ static inline void __user *get_sigframe(struct k_sigaction *ka,
sp = regs->regs[29]; sp = regs->regs[29];
/* /*
* FPU emulator may have it's own trampoline active just * FPU emulator may have it's own trampoline active just
* above the user stack, 16-bytes before the next lowest * above the user stack, 16-bytes before the next lowest
* 16 byte boundary. Try to avoid trashing it. * 16 byte boundary. Try to avoid trashing it.
*/ */
sp -= 32; sp -= 32;
/* This is the X/Open sanctioned signal stack switching. */ /* This is the X/Open sanctioned signal stack switching. */
if ((ka->sa.sa_flags & SA_ONSTACK) && (sas_ss_flags (sp) == 0)) if ((ka->sa.sa_flags & SA_ONSTACK) && (sas_ss_flags (sp) == 0))
......
...@@ -576,7 +576,7 @@ asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31) ...@@ -576,7 +576,7 @@ asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31)
} }
#endif #endif
/* /*
* Unimplemented operation exception. If we've got the full * Unimplemented operation exception. If we've got the full
* software emulator on-board, let's use it... * software emulator on-board, let's use it...
* *
* Force FPU to dump state into task/thread context. We're * Force FPU to dump state into task/thread context. We're
......
...@@ -16,7 +16,8 @@ SECTIONS ...@@ -16,7 +16,8 @@ SECTIONS
_image_start = ADDR(.data); _image_start = ADDR(.data);
_image_size = SIZEOF(.data); _image_size = SIZEOF(.data);
.other : { .other :
*(.*) {
*(.*)
} }
} }
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
and s0, s1 and s0, s1
#if defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64) #if defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64)
.set mips32 .set mips32
clz a0, s0 clz a0, s0
.set mips0 .set mips0
negu a0 negu a0
......
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
andi a0, s0, CAUSEF_IP3 # delay slot, check hw1 interrupt andi a0, s0, CAUSEF_IP3 # delay slot, check hw1 interrupt
#else #else
beq a0, zero, 1f # delay slot, check hw3 interrupt beq a0, zero, 1f # delay slot, check hw3 interrupt
andi a0, s0, CAUSEF_IP5 andi a0, s0, CAUSEF_IP5
#endif #endif
/* Wheee, combined hardware level zero interrupt. */ /* Wheee, combined hardware level zero interrupt. */
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
and s0, s1 and s0, s1
#if defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64) #if defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64)
.set mips32 .set mips32
clz a0, s0 clz a0, s0
.set mips0 .set mips0
negu a0 negu a0
......
...@@ -115,7 +115,7 @@ void prom_prepare_cpus(unsigned int max_cpus) ...@@ -115,7 +115,7 @@ void prom_prepare_cpus(unsigned int max_cpus)
#ifdef CONFIG_MIPS_MT_SMTC #ifdef CONFIG_MIPS_MT_SMTC
void mipsmt_prepare_cpus(int c); void mipsmt_prepare_cpus(int c);
/* /*
* As noted above, we can assume a single CPU for now * As noted above, we can assume a single CPU for now
* but it may be multithreaded. * but it may be multithreaded.
*/ */
......
...@@ -129,7 +129,7 @@ static void r3k_flush_icache_range(unsigned long start, unsigned long end) ...@@ -129,7 +129,7 @@ static void r3k_flush_icache_range(unsigned long start, unsigned long end)
"sb\t$0, 0x014(%0)\n\t" "sb\t$0, 0x014(%0)\n\t"
"sb\t$0, 0x018(%0)\n\t" "sb\t$0, 0x018(%0)\n\t"
"sb\t$0, 0x01c(%0)\n\t" "sb\t$0, 0x01c(%0)\n\t"
"sb\t$0, 0x020(%0)\n\t" "sb\t$0, 0x020(%0)\n\t"
"sb\t$0, 0x024(%0)\n\t" "sb\t$0, 0x024(%0)\n\t"
"sb\t$0, 0x028(%0)\n\t" "sb\t$0, 0x028(%0)\n\t"
"sb\t$0, 0x02c(%0)\n\t" "sb\t$0, 0x02c(%0)\n\t"
...@@ -145,7 +145,7 @@ static void r3k_flush_icache_range(unsigned long start, unsigned long end) ...@@ -145,7 +145,7 @@ static void r3k_flush_icache_range(unsigned long start, unsigned long end)
"sb\t$0, 0x054(%0)\n\t" "sb\t$0, 0x054(%0)\n\t"
"sb\t$0, 0x058(%0)\n\t" "sb\t$0, 0x058(%0)\n\t"
"sb\t$0, 0x05c(%0)\n\t" "sb\t$0, 0x05c(%0)\n\t"
"sb\t$0, 0x060(%0)\n\t" "sb\t$0, 0x060(%0)\n\t"
"sb\t$0, 0x064(%0)\n\t" "sb\t$0, 0x064(%0)\n\t"
"sb\t$0, 0x068(%0)\n\t" "sb\t$0, 0x068(%0)\n\t"
"sb\t$0, 0x06c(%0)\n\t" "sb\t$0, 0x06c(%0)\n\t"
...@@ -182,31 +182,31 @@ static void r3k_flush_dcache_range(unsigned long start, unsigned long end) ...@@ -182,31 +182,31 @@ static void r3k_flush_dcache_range(unsigned long start, unsigned long end)
"sb\t$0, 0x004(%0)\n\t" "sb\t$0, 0x004(%0)\n\t"
"sb\t$0, 0x008(%0)\n\t" "sb\t$0, 0x008(%0)\n\t"
"sb\t$0, 0x00c(%0)\n\t" "sb\t$0, 0x00c(%0)\n\t"
"sb\t$0, 0x010(%0)\n\t" "sb\t$0, 0x010(%0)\n\t"
"sb\t$0, 0x014(%0)\n\t" "sb\t$0, 0x014(%0)\n\t"
"sb\t$0, 0x018(%0)\n\t" "sb\t$0, 0x018(%0)\n\t"
"sb\t$0, 0x01c(%0)\n\t" "sb\t$0, 0x01c(%0)\n\t"
"sb\t$0, 0x020(%0)\n\t" "sb\t$0, 0x020(%0)\n\t"
"sb\t$0, 0x024(%0)\n\t" "sb\t$0, 0x024(%0)\n\t"
"sb\t$0, 0x028(%0)\n\t" "sb\t$0, 0x028(%0)\n\t"
"sb\t$0, 0x02c(%0)\n\t" "sb\t$0, 0x02c(%0)\n\t"
"sb\t$0, 0x030(%0)\n\t" "sb\t$0, 0x030(%0)\n\t"
"sb\t$0, 0x034(%0)\n\t" "sb\t$0, 0x034(%0)\n\t"
"sb\t$0, 0x038(%0)\n\t" "sb\t$0, 0x038(%0)\n\t"
"sb\t$0, 0x03c(%0)\n\t" "sb\t$0, 0x03c(%0)\n\t"
"sb\t$0, 0x040(%0)\n\t" "sb\t$0, 0x040(%0)\n\t"
"sb\t$0, 0x044(%0)\n\t" "sb\t$0, 0x044(%0)\n\t"
"sb\t$0, 0x048(%0)\n\t" "sb\t$0, 0x048(%0)\n\t"
"sb\t$0, 0x04c(%0)\n\t" "sb\t$0, 0x04c(%0)\n\t"
"sb\t$0, 0x050(%0)\n\t" "sb\t$0, 0x050(%0)\n\t"
"sb\t$0, 0x054(%0)\n\t" "sb\t$0, 0x054(%0)\n\t"
"sb\t$0, 0x058(%0)\n\t" "sb\t$0, 0x058(%0)\n\t"
"sb\t$0, 0x05c(%0)\n\t" "sb\t$0, 0x05c(%0)\n\t"
"sb\t$0, 0x060(%0)\n\t" "sb\t$0, 0x060(%0)\n\t"
"sb\t$0, 0x064(%0)\n\t" "sb\t$0, 0x064(%0)\n\t"
"sb\t$0, 0x068(%0)\n\t" "sb\t$0, 0x068(%0)\n\t"
"sb\t$0, 0x06c(%0)\n\t" "sb\t$0, 0x06c(%0)\n\t"
"sb\t$0, 0x070(%0)\n\t" "sb\t$0, 0x070(%0)\n\t"
"sb\t$0, 0x074(%0)\n\t" "sb\t$0, 0x074(%0)\n\t"
"sb\t$0, 0x078(%0)\n\t" "sb\t$0, 0x078(%0)\n\t"
"sb\t$0, 0x07c(%0)\n\t" "sb\t$0, 0x07c(%0)\n\t"
......
...@@ -32,7 +32,7 @@ void momenco_jaguar_restart(char *command) ...@@ -32,7 +32,7 @@ void momenco_jaguar_restart(char *command)
#else #else
void *nvram = (void*) 0xfc807000; void *nvram = (void*) 0xfc807000;
#endif #endif
/* Ask the NVRAM/RTC/watchdog chip to assert reset in 1/16 second */ /* Ask the NVRAM/RTC/watchdog chip to assert reset in 1/16 second */
writeb(0x84, nvram + 0xff7); writeb(0x84, nvram + 0xff7);
/* wait for the watchdog to go off */ /* wait for the watchdog to go off */
......
...@@ -461,7 +461,7 @@ void __init plat_setup(void) ...@@ -461,7 +461,7 @@ void __init plat_setup(void)
unsigned int tbControl; unsigned int tbControl;
tbControl = tbControl =
0 << 26 | /* post trigger delay 0 */ 0 << 26 | /* post trigger delay 0 */
0x2 << 16 | /* sequential trace mode */ 0x2 << 16 | /* sequential trace mode */
// 0x0 << 16 | /* non-sequential trace mode */ // 0x0 << 16 | /* non-sequential trace mode */
// 0xf << 4 | /* watchpoints disabled */ // 0xf << 4 | /* watchpoints disabled */
2 << 2 | /* armed */ 2 << 2 | /* armed */
......
...@@ -34,7 +34,7 @@ void momenco_ocelot_restart(char *command) ...@@ -34,7 +34,7 @@ void momenco_ocelot_restart(char *command)
/* base address of timekeeper portion of part */ /* base address of timekeeper portion of part */
void *nvram = (void *) 0xfc807000L; void *nvram = (void *) 0xfc807000L;
/* Ask the NVRAM/RTC/watchdog chip to assert reset in 1/16 second */ /* Ask the NVRAM/RTC/watchdog chip to assert reset in 1/16 second */
writeb(0x84, nvram + 0xff7); writeb(0x84, nvram + 0xff7);
/* wait for the watchdog to go off */ /* wait for the watchdog to go off */
......
...@@ -34,7 +34,7 @@ void momenco_ocelot_restart(char *command) ...@@ -34,7 +34,7 @@ void momenco_ocelot_restart(char *command)
0xfc807000; 0xfc807000;
#endif #endif
/* Ask the NVRAM/RTC/watchdog chip to assert reset in 1/16 second */ /* Ask the NVRAM/RTC/watchdog chip to assert reset in 1/16 second */
writeb(0x84, nvram + 0xff7); writeb(0x84, nvram + 0xff7);
/* wait for the watchdog to go off */ /* wait for the watchdog to go off */
......
...@@ -45,7 +45,7 @@ int pcibios_plat_dev_init(struct pci_dev *dev) ...@@ -45,7 +45,7 @@ int pcibios_plat_dev_init(struct pci_dev *dev)
/* /*
* we have to open the bridges' windows down to 0 because otherwise * we have to open the bridges' windows down to 0 because otherwise
* we cannot access ISA south bridge I/O registers that get mapped from * we cannot access ISA south bridge I/O registers that get mapped from
* 0. for example, 8259 PIC would be unaccessible without that * 0. for example, 8259 PIC would be unaccessible without that
*/ */
if(dev->vendor == PCI_VENDOR_ID_INTEL && dev->device == PCI_DEVICE_ID_INTEL_S21152BB) { if(dev->vendor == PCI_VENDOR_ID_INTEL && dev->device == PCI_DEVICE_ID_INTEL_S21152BB) {
......
...@@ -253,9 +253,9 @@ static int write_config_byte(struct pci_config_swap *swap, ...@@ -253,9 +253,9 @@ static int write_config_byte(struct pci_config_swap *swap,
static int prefix##_##rw##_config(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 star val) \ static int prefix##_##rw##_config(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 star val) \
{ \ { \
if (size == 1) \ if (size == 1) \
return rw##_config_byte(pciswap, bus, devfn, where, (u8 star)val); \ return rw##_config_byte(pciswap, bus, devfn, where, (u8 star)val); \
else if (size == 2) \ else if (size == 2) \
return rw##_config_word(pciswap, bus, devfn, where, (u16 star)val); \ return rw##_config_word(pciswap, bus, devfn, where, (u16 star)val); \
/* Size must be 4 */ \ /* Size must be 4 */ \
return rw##_config_dword(pciswap, bus, devfn, where, val); \ return rw##_config_dword(pciswap, bus, devfn, where, val); \
} }
......
...@@ -34,16 +34,16 @@ struct resource pci_mem_resource = { ...@@ -34,16 +34,16 @@ struct resource pci_mem_resource = {
}; };
struct resource tx4938_pcic1_pci_io_resource = { struct resource tx4938_pcic1_pci_io_resource = {
.name = "PCI1 IO", .name = "PCI1 IO",
.start = 0, .start = 0,
.end = 0, .end = 0,
.flags = IORESOURCE_IO .flags = IORESOURCE_IO
}; };
struct resource tx4938_pcic1_pci_mem_resource = { struct resource tx4938_pcic1_pci_mem_resource = {
.name = "PCI1 mem", .name = "PCI1 mem",
.start = 0, .start = 0,
.end = 0, .end = 0,
.flags = IORESOURCE_MEM .flags = IORESOURCE_MEM
}; };
static int mkaddr(int bus, int dev_fn, int where, int *flagsp) static int mkaddr(int bus, int dev_fn, int where, int *flagsp)
......
...@@ -100,7 +100,7 @@ static int bcm1480_pci_can_access(struct pci_bus *bus, int devfn) ...@@ -100,7 +100,7 @@ static int bcm1480_pci_can_access(struct pci_bus *bus, int devfn)
if (bus->number == 0) { if (bus->number == 0) {
devno = PCI_SLOT(devfn); devno = PCI_SLOT(devfn);
if (bcm1480_bus_status & PCI_DEVICE_MODE) if (bcm1480_bus_status & PCI_DEVICE_MODE)
return 0; return 0;
else else
return 1; return 1;
......
...@@ -95,7 +95,7 @@ static int bcm1480ht_can_access(struct pci_bus *bus, int devfn) ...@@ -95,7 +95,7 @@ static int bcm1480ht_can_access(struct pci_bus *bus, int devfn)
if (bus->number == 0) { if (bus->number == 0) {
devno = PCI_SLOT(devfn); devno = PCI_SLOT(devfn);
if (bcm1480ht_bus_status & PCI_DEVICE_MODE) if (bcm1480ht_bus_status & PCI_DEVICE_MODE)
return 0; return 0;
} }
return 1; return 1;
......
...@@ -379,18 +379,18 @@ int __init bridge_probe(nasid_t nasid, int widget_id, int masterwid) ...@@ -379,18 +379,18 @@ int __init bridge_probe(nasid_t nasid, int widget_id, int masterwid)
bridge = (bridge_t *) RAW_NODE_SWIN_BASE(nasid, widget_id); bridge = (bridge_t *) RAW_NODE_SWIN_BASE(nasid, widget_id);
/* /*
* Clear all pending interrupts. * Clear all pending interrupts.
*/ */
bridge->b_int_rst_stat = BRIDGE_IRR_ALL_CLR; bridge->b_int_rst_stat = BRIDGE_IRR_ALL_CLR;
/* /*
* Until otherwise set up, assume all interrupts are from slot 0 * Until otherwise set up, assume all interrupts are from slot 0
*/ */
bridge->b_int_device = 0x0; bridge->b_int_device = 0x0;
/* /*
* swap pio's to pci mem and io space (big windows) * swap pio's to pci mem and io space (big windows)
*/ */
bridge->b_wid_control |= BRIDGE_CTRL_IO_SWAP | bridge->b_wid_control |= BRIDGE_CTRL_IO_SWAP |
BRIDGE_CTRL_MEM_SWAP; BRIDGE_CTRL_MEM_SWAP;
......
...@@ -251,7 +251,7 @@ void __init arch_init_irq(void) ...@@ -251,7 +251,7 @@ void __init arch_init_irq(void)
if (gic_int_line == (PNX8550_INT_GPIO0 - PNX8550_INT_GIC_MIN)) { if (gic_int_line == (PNX8550_INT_GPIO0 - PNX8550_INT_GIC_MIN)) {
/* PCI INT through gpio 8, which is setup in /* PCI INT through gpio 8, which is setup in
* pnx8550_setup.c and routed to GPIO * pnx8550_setup.c and routed to GPIO
* Interrupt Level 0 (GPIO Connection 58). * Interrupt Level 0 (GPIO Connection 58).
* Set it active low. */ * Set it active low. */
PNX8550_GIC_REQ(gic_int_line) = 0x1E020000; PNX8550_GIC_REQ(gic_int_line) = 0x1E020000;
......
...@@ -540,8 +540,8 @@ void __init mem_init(void) ...@@ -540,8 +540,8 @@ void __init mem_init(void)
struct page *end, *p; struct page *end, *p;
/* /*
* This will free up the bootmem, ie, slot 0 memory. * This will free up the bootmem, ie, slot 0 memory.
*/ */
totalram_pages += free_all_bootmem_node(NODE_DATA(node)); totalram_pages += free_all_bootmem_node(NODE_DATA(node));
/* /*
......
...@@ -98,7 +98,7 @@ void __init plat_setup(void) ...@@ -98,7 +98,7 @@ void __init plat_setup(void)
board_timer_setup = ip32_timer_setup; board_timer_setup = ip32_timer_setup;
#ifdef CONFIG_SERIAL_8250 #ifdef CONFIG_SERIAL_8250
{ {
static struct uart_port o2_serial[2]; static struct uart_port o2_serial[2];
memset(o2_serial, 0, sizeof(o2_serial)); memset(o2_serial, 0, sizeof(o2_serial));
......
...@@ -70,10 +70,10 @@ void __init prom_init(void) ...@@ -70,10 +70,10 @@ void __init prom_init(void)
if ((read_c0_prid() & 0xff) == PRID_REV_TX4927) { if ((read_c0_prid() & 0xff) == PRID_REV_TX4927) {
mips_machtype = MACH_TOSHIBA_RBTX4927; mips_machtype = MACH_TOSHIBA_RBTX4927;
toshiba_name = "TX4927"; toshiba_name = "TX4927";
} else { } else {
mips_machtype = MACH_TOSHIBA_RBTX4937; mips_machtype = MACH_TOSHIBA_RBTX4937;
toshiba_name = "TX4937"; toshiba_name = "TX4937";
} }
msize = tx4927_get_mem_size(); msize = tx4927_get_mem_size();
......
...@@ -684,7 +684,7 @@ void __init tx4938_board_setup(void) ...@@ -684,7 +684,7 @@ void __init tx4938_board_setup(void)
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
if (!(tx4938_ebuscptr->cr[i] & 0x8)) if (!(tx4938_ebuscptr->cr[i] & 0x8))
continue; /* disabled */ continue; /* disabled */
rbtx4938_ce_base[i] = (unsigned long)TX4938_EBUSC_BA(i); rbtx4938_ce_base[i] = (unsigned long)TX4938_EBUSC_BA(i);
txboard_add_phys_region(rbtx4938_ce_base[i], TX4938_EBUSC_SIZE(i)); txboard_add_phys_region(rbtx4938_ce_base[i], TX4938_EBUSC_SIZE(i));
} }
......
...@@ -183,11 +183,11 @@ static inline unsigned long calculate_tclock(uint16_t clkspeed, unsigned long pc ...@@ -183,11 +183,11 @@ static inline unsigned long calculate_tclock(uint16_t clkspeed, unsigned long pc
switch (current_cpu_data.cputype) { switch (current_cpu_data.cputype) {
case CPU_VR4111: case CPU_VR4111:
if (!(clkspeed & DIV2B)) if (!(clkspeed & DIV2B))
tclock = pclock / 2; tclock = pclock / 2;
else if (!(clkspeed & DIV3B)) else if (!(clkspeed & DIV3B))
tclock = pclock / 3; tclock = pclock / 3;
else if (!(clkspeed & DIV4B)) else if (!(clkspeed & DIV4B))
tclock = pclock / 4; tclock = pclock / 4;
break; break;
case CPU_VR4121: case CPU_VR4121:
tclock = pclock / DIVT(clkspeed); tclock = pclock / DIVT(clkspeed);
......
...@@ -206,7 +206,7 @@ pfn_pte(unsigned long pfn, pgprot_t prot) ...@@ -206,7 +206,7 @@ pfn_pte(unsigned long pfn, pgprot_t prot)
/* fixme */ /* fixme */
#define pte_to_pgoff(_pte) (((_pte).pte_high >> 6) + ((_pte).pte_high & 0x3f)) #define pte_to_pgoff(_pte) (((_pte).pte_high >> 6) + ((_pte).pte_high & 0x3f))
#define pgoff_to_pte(off) \ #define pgoff_to_pte(off) \
((pte_t){(((off) & 0x3f) + ((off) << 6) + _PAGE_FILE)}) ((pte_t){(((off) & 0x3f) + ((off) << 6) + _PAGE_FILE)})
#else #else
#define pte_to_pgoff(_pte) \ #define pte_to_pgoff(_pte) \
......
...@@ -99,7 +99,7 @@ typedef s32 klconf_off_t; ...@@ -99,7 +99,7 @@ typedef s32 klconf_off_t;
#define ENABLE_BOARD 0x01 #define ENABLE_BOARD 0x01
#define FAILED_BOARD 0x02 #define FAILED_BOARD 0x02
#define DUPLICATE_BOARD 0x04 /* Boards like midplanes/routers which #define DUPLICATE_BOARD 0x04 /* Boards like midplanes/routers which
are discovered twice. Use one of them */ are discovered twice. Use one of them */
#define VISITED_BOARD 0x08 /* Used for compact hub numbering. */ #define VISITED_BOARD 0x08 /* Used for compact hub numbering. */
#define LOCAL_MASTER_IO6 0x10 /* master io6 for that node */ #define LOCAL_MASTER_IO6 0x10 /* master io6 for that node */
#define GLOBAL_MASTER_IO6 0x20 #define GLOBAL_MASTER_IO6 0x20
......
...@@ -229,7 +229,7 @@ typedef union hubii_ilcsr_u { ...@@ -229,7 +229,7 @@ typedef union hubii_ilcsr_u {
icsr_llp_en: 1, /* LLP enable bit */ icsr_llp_en: 1, /* LLP enable bit */
icsr_rsvd2: 1, /* reserver */ icsr_rsvd2: 1, /* reserver */
icsr_wrm_reset: 1, /* Warm reset bit */ icsr_wrm_reset: 1, /* Warm reset bit */
icsr_rsvd1: 2, /* Data ready offset */ icsr_rsvd1: 2, /* Data ready offset */
icsr_null_to: 6; /* Null timeout */ icsr_null_to: 6; /* Null timeout */
} icsr_fields_s; } icsr_fields_s;
...@@ -274,9 +274,9 @@ typedef union io_perf_sel { ...@@ -274,9 +274,9 @@ typedef union io_perf_sel {
u64 perf_sel_reg; u64 perf_sel_reg;
struct { struct {
u64 perf_rsvd : 48, u64 perf_rsvd : 48,
perf_icct : 8, perf_icct : 8,
perf_ippr1 : 4, perf_ippr1 : 4,
perf_ippr0 : 4; perf_ippr0 : 4;
} perf_sel_bits; } perf_sel_bits;
} io_perf_sel_t; } io_perf_sel_t;
...@@ -287,8 +287,8 @@ typedef union io_perf_cnt { ...@@ -287,8 +287,8 @@ typedef union io_perf_cnt {
u64 perf_cnt; u64 perf_cnt;
struct { struct {
u64 perf_rsvd1 : 32, u64 perf_rsvd1 : 32,
perf_rsvd2 : 12, perf_rsvd2 : 12,
perf_cnt : 20; perf_cnt : 20;
} perf_cnt_bits; } perf_cnt_bits;
} io_perf_cnt_t; } io_perf_cnt_t;
......
...@@ -31,7 +31,7 @@ struct thread_info { ...@@ -31,7 +31,7 @@ struct thread_info {
int preempt_count; /* 0 => preemptable, <0 => BUG */ int preempt_count; /* 0 => preemptable, <0 => BUG */
mm_segment_t addr_limit; /* thread address space: mm_segment_t addr_limit; /* thread address space:
0-0xBFFFFFFF for user-thead 0-0xBFFFFFFF for user-thead
0-0xFFFFFFFF for kernel-thread 0-0xFFFFFFFF for kernel-thread
*/ */
struct restart_block restart_block; struct restart_block restart_block;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment