[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>
This commit is contained in:
Ralf Baechle 2005-09-03 15:56:17 -07:00 committed by Linus Torvalds
parent 875d43e72b
commit 42a3b4f25a
137 changed files with 596 additions and 596 deletions

View file

@ -177,7 +177,7 @@ cflags-$(CONFIG_CPU_MIPS64) += \
cflags-$(CONFIG_CPU_R5000) += \ cflags-$(CONFIG_CPU_R5000) += \
$(call set_gccflags,r5000,mips4,r5000,mips4,mips2) \ $(call set_gccflags,r5000,mips4,r5000,mips4,mips2) \
-Wa,--trap -Wa,--trap
cflags-$(CONFIG_CPU_R5432) += \ cflags-$(CONFIG_CPU_R5432) += \
$(call set_gccflags,r5400,mips4,r5000,mips4,mips2) \ $(call set_gccflags,r5400,mips4,r5000,mips4,mips2) \
@ -720,7 +720,7 @@ archclean:
@$(MAKE) $(clean)=arch/mips/boot @$(MAKE) $(clean)=arch/mips/boot
@$(MAKE) $(clean)=arch/mips/lasat @$(MAKE) $(clean)=arch/mips/lasat
# Generate <asm/offset.h # Generate <asm/offset.h
# #
# The default rule is suffering from funny problems on MIPS so we using our # The default rule is suffering from funny problems on MIPS so we using our
# own ... # own ...

View file

@ -40,14 +40,14 @@
/* TBD */ /* TBD */
static struct resource pci_io_resource = { static struct resource pci_io_resource = {
"pci IO space", "pci IO space",
(u32)PCI_IO_START, (u32)PCI_IO_START,
(u32)PCI_IO_END, (u32)PCI_IO_END,
IORESOURCE_IO IORESOURCE_IO
}; };
static struct resource pci_mem_resource = { static struct resource pci_mem_resource = {
"pci memory space", "pci memory space",
(u32)PCI_MEM_START, (u32)PCI_MEM_START,
(u32)PCI_MEM_END, (u32)PCI_MEM_END,
IORESOURCE_MEM IORESOURCE_MEM
@ -68,7 +68,7 @@ static unsigned long virt_io_addr;
static int __init au1x_pci_setup(void) static int __init au1x_pci_setup(void)
{ {
#if defined(CONFIG_SOC_AU1500) || defined(CONFIG_SOC_AU1550) #if defined(CONFIG_SOC_AU1500) || defined(CONFIG_SOC_AU1550)
virt_io_addr = (unsigned long)ioremap(Au1500_PCI_IO_START, virt_io_addr = (unsigned long)ioremap(Au1500_PCI_IO_START,
Au1500_PCI_IO_END - Au1500_PCI_IO_START + 1); Au1500_PCI_IO_END - Au1500_PCI_IO_START + 1);
if (!virt_io_addr) { if (!virt_io_addr) {
@ -77,7 +77,7 @@ static int __init au1x_pci_setup(void)
} }
#ifdef CONFIG_DMA_NONCOHERENT #ifdef CONFIG_DMA_NONCOHERENT
/* /*
* Set the NC bit in controller for Au1500 pre-AC silicon * Set the NC bit in controller for Au1500 pre-AC silicon
*/ */
u32 prid = read_c0_prid(); u32 prid = read_c0_prid();

View file

@ -97,7 +97,7 @@ static int __init au1x00_setup(void)
argptr = prom_getcmdline(); argptr = prom_getcmdline();
strcat(argptr, " console=ttyS0,115200"); strcat(argptr, " console=ttyS0,115200");
} }
#endif #endif
#ifdef CONFIG_FB_AU1100 #ifdef CONFIG_FB_AU1100
if ((argptr = strstr(argptr, "video=")) == NULL) { if ((argptr = strstr(argptr, "video=")) == NULL) {

View file

@ -281,7 +281,7 @@ unsigned long cal_r4koff(void)
cpu_speed = count * 2; cpu_speed = count * 2;
} }
#else #else
cpu_speed = (au_readl(SYS_CPUPLL) & 0x0000003f) * cpu_speed = (au_readl(SYS_CPUPLL) & 0x0000003f) *
AU1000_SRC_CLK; AU1000_SRC_CLK;
count = cpu_speed / 2; count = cpu_speed / 2;
#endif #endif
@ -356,7 +356,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)
@ -375,8 +375,8 @@ static unsigned long do_fast_pm_gettimeoffset(void)
au_sync(); au_sync();
offset = pc0 - last_pc0; offset = pc0 - last_pc0;
if (offset > 2*MATCH20_INC) { if (offset > 2*MATCH20_INC) {
printk("huge offset %x, last_pc0 %x last_match20 %x pc0 %x\n", printk("huge offset %x, last_pc0 %x last_match20 %x pc0 %x\n",
(unsigned)offset, (unsigned)last_pc0, (unsigned)offset, (unsigned)last_pc0,
(unsigned)last_match20, (unsigned)pc0); (unsigned)last_match20, (unsigned)pc0);
} }
offset = (unsigned long)((offset * 305) / 10); offset = (unsigned long)((offset * 305) / 10);
@ -394,11 +394,11 @@ void au1xxx_timer_setup(struct irqaction *irq)
r4k_offset = cal_r4koff(); r4k_offset = cal_r4koff();
printk("%08lx(%d)\n", r4k_offset, (int) r4k_offset); printk("%08lx(%d)\n", r4k_offset, (int) r4k_offset);
//est_freq = 2*r4k_offset*HZ; //est_freq = 2*r4k_offset*HZ;
est_freq = r4k_offset*HZ; est_freq = r4k_offset*HZ;
est_freq += 5000; /* round */ est_freq += 5000; /* round */
est_freq -= est_freq%10000; est_freq -= est_freq%10000;
printk("CPU frequency %d.%02d MHz\n", est_freq/1000000, printk("CPU frequency %d.%02d MHz\n", est_freq/1000000,
(est_freq%1000000)*100/1000000); (est_freq%1000000)*100/1000000);
set_au1x00_speed(est_freq); set_au1x00_speed(est_freq);
set_au1x00_lcd_clock(); // program the LCD clock set_au1x00_lcd_clock(); // program the LCD clock

View file

@ -182,7 +182,7 @@ void __init board_setup(void)
au_writel(0xf0000000, Au1500_PCI_MWMASK_DEV); au_writel(0xf0000000, Au1500_PCI_MWMASK_DEV);
au_writel(0, Au1500_PCI_MWBASE_REV_CCL); au_writel(0, Au1500_PCI_MWBASE_REV_CCL);
au_writel(0x02a00356, Au1500_PCI_STATCMD); au_writel(0x02a00356, Au1500_PCI_STATCMD);
au_writel(0x00003c04, Au1500_PCI_HDRTYPE); au_writel(0x00003c04, Au1500_PCI_HDRTYPE);
au_writel(0x00000008, Au1500_PCI_MBAR); au_writel(0x00000008, Au1500_PCI_MBAR);
au_sync(); au_sync();
@ -216,7 +216,7 @@ csb250_pci_idsel(unsigned int devsel, int assert)
unsigned int gpio2_pins; unsigned int gpio2_pins;
retval = 1; retval = 1;
/* First, disable both selects, then assert the one requested. /* First, disable both selects, then assert the one requested.
*/ */
au_writel(0xc000c000, GPIO2_OUTPUT); au_writel(0xc000c000, GPIO2_OUTPUT);

View file

@ -81,7 +81,7 @@ int __init prom_init(int argc, char **argv, char **envp, int *prom_vec)
csb_env[0] = env1; csb_env[0] = env1;
mips_machgroup = MACH_GROUP_ALCHEMY; mips_machgroup = MACH_GROUP_ALCHEMY;
mips_machtype = MACH_CSB250; mips_machtype = MACH_CSB250;
prom_init_cmdline(); prom_init_cmdline();
memsize_str = prom_getenv("memsize"); memsize_str = prom_getenv("memsize");

View file

@ -61,7 +61,7 @@ void __init prom_init(void)
prom_envp = (char **) fw_arg2; prom_envp = (char **) fw_arg2;
mips_machgroup = MACH_GROUP_ALCHEMY; mips_machgroup = MACH_GROUP_ALCHEMY;
mips_machtype = MACH_DB1000; /* set the platform # */ mips_machtype = MACH_DB1000; /* set the platform # */
prom_init_cmdline(); prom_init_cmdline();

View file

@ -63,7 +63,7 @@ int __init prom_init(int argc, char **argv, char **envp, int *prom_vec)
prom_envp = envp; prom_envp = envp;
mips_machgroup = MACH_GROUP_ALCHEMY; mips_machgroup = MACH_GROUP_ALCHEMY;
mips_machtype = MACH_DB1000; /* set the platform # */ mips_machtype = MACH_DB1000; /* set the platform # */
prom_init_cmdline(); prom_init_cmdline();
memsize_str = prom_getenv("memsize"); memsize_str = prom_getenv("memsize");

View file

@ -174,7 +174,7 @@ void __init board_setup(void)
case 0x02: /* HB */ case 0x02: /* HB */
break; break;
default: /* HC and newer */ default: /* HC and newer */
/* Enable sys bus clock divider when IDLE state or no bus /* Enable sys bus clock divider when IDLE state or no bus
activity. */ activity. */
au_writel(au_readl(SYS_POWERCTRL) | (0x3 << 5), SYS_POWERCTRL); au_writel(au_readl(SYS_POWERCTRL) | (0x3 << 5), SYS_POWERCTRL);
break; break;

View file

@ -49,7 +49,7 @@ void board_reset (void)
void __init board_setup(void) void __init board_setup(void)
{ {
u32 pin_func; u32 pin_func;
// set multiple use pins (UART3/GPIO) to UART (it's used as UART too) // set multiple use pins (UART3/GPIO) to UART (it's used as UART too)
pin_func = au_readl(SYS_PINFUNC) & (u32)(~SYS_PF_UR3); pin_func = au_readl(SYS_PINFUNC) & (u32)(~SYS_PF_UR3);
pin_func |= SYS_PF_UR3; pin_func |= SYS_PF_UR3;
@ -75,11 +75,11 @@ void __init board_setup(void)
au_writel(1, GPIO2_ENABLE); au_writel(1, GPIO2_ENABLE);
/* gpio2 208/9/10/11 are inputs */ /* gpio2 208/9/10/11 are inputs */
au_writel((1<<8) | (1<<9) | (1<<10) | (1<<11), GPIO2_DIR); au_writel((1<<8) | (1<<9) | (1<<10) | (1<<11), GPIO2_DIR);
/* turn off power */ /* turn off power */
au_writel((au_readl(GPIO2_PINSTATE) & ~(1<<14))|(1<<30), GPIO2_OUTPUT); au_writel((au_readl(GPIO2_PINSTATE) & ~(1<<14))|(1<<30), GPIO2_OUTPUT);
#endif #endif
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
#if defined(__MIPSEB__) #if defined(__MIPSEB__)

View file

@ -55,7 +55,7 @@ void __init prom_init(void)
prom_envp = (char **) fw_arg2; prom_envp = (char **) fw_arg2;
mips_machgroup = MACH_GROUP_ALCHEMY; mips_machgroup = MACH_GROUP_ALCHEMY;
mips_machtype = MACH_XXS1500; /* set the platform # */ mips_machtype = MACH_XXS1500; /* set the platform # */
prom_init_cmdline(); prom_init_cmdline();

View file

@ -56,7 +56,7 @@ au1xxx_irq_map_t au1xxx_irq_map[] = {
{ AU1500_GPIO_207, INTC_INT_LOW_LEVEL, 0 }, { AU1500_GPIO_207, INTC_INT_LOW_LEVEL, 0 },
{ AU1000_GPIO_0, INTC_INT_LOW_LEVEL, 0 }, { AU1000_GPIO_0, INTC_INT_LOW_LEVEL, 0 },
{ AU1000_GPIO_1, INTC_INT_LOW_LEVEL, 0 }, { AU1000_GPIO_1, INTC_INT_LOW_LEVEL, 0 },
{ AU1000_GPIO_2, INTC_INT_LOW_LEVEL, 0 }, { AU1000_GPIO_2, INTC_INT_LOW_LEVEL, 0 },
{ AU1000_GPIO_3, INTC_INT_LOW_LEVEL, 0 }, { AU1000_GPIO_3, INTC_INT_LOW_LEVEL, 0 },
{ AU1000_GPIO_4, INTC_INT_LOW_LEVEL, 0 }, /* CF interrupt */ { AU1000_GPIO_4, INTC_INT_LOW_LEVEL, 0 }, /* CF interrupt */

View file

@ -76,7 +76,7 @@ set_pci_int_attr(u32 pci, u32 intn, u32 active, u32 trigger)
extern void vrc5477_irq_init(u32 base); extern void vrc5477_irq_init(u32 base);
extern void mips_cpu_irq_init(u32 base); extern void mips_cpu_irq_init(u32 base);
extern asmlinkage void ddb5477_handle_int(void); extern asmlinkage void ddb5477_handle_int(void);
extern int setup_irq(unsigned int irq, struct irqaction *irqaction); extern int setup_irq(unsigned int irq, struct irqaction *irqaction);
static struct irqaction irq_cascade = { no_action, 0, CPU_MASK_NONE, "cascade", NULL, NULL }; static struct irqaction irq_cascade = { no_action, 0, CPU_MASK_NONE, "cascade", NULL, NULL };
void __init arch_init_irq(void) void __init arch_init_irq(void)
@ -94,7 +94,7 @@ void __init arch_init_irq(void)
/* setup PCI interrupt attributes */ /* setup PCI interrupt attributes */
set_pci_int_attr(PCI0, INTA, ACTIVE_LOW, LEVEL_SENSE); set_pci_int_attr(PCI0, INTA, ACTIVE_LOW, LEVEL_SENSE);
set_pci_int_attr(PCI0, INTB, ACTIVE_LOW, LEVEL_SENSE); set_pci_int_attr(PCI0, INTB, ACTIVE_LOW, LEVEL_SENSE);
if (mips_machtype == MACH_NEC_ROCKHOPPERII) if (mips_machtype == MACH_NEC_ROCKHOPPERII)
set_pci_int_attr(PCI0, INTC, ACTIVE_HIGH, LEVEL_SENSE); set_pci_int_attr(PCI0, INTC, ACTIVE_HIGH, LEVEL_SENSE);
else else
set_pci_int_attr(PCI0, INTC, ACTIVE_LOW, LEVEL_SENSE); set_pci_int_attr(PCI0, INTC, ACTIVE_LOW, LEVEL_SENSE);
@ -134,7 +134,7 @@ void __init arch_init_irq(void)
/* setup cascade interrupts */ /* setup cascade interrupts */
setup_irq(VRC5477_IRQ_BASE + VRC5477_I8259_CASCADE, &irq_cascade); setup_irq(VRC5477_IRQ_BASE + VRC5477_I8259_CASCADE, &irq_cascade);
setup_irq(CPU_IRQ_BASE + CPU_VRC5477_CASCADE, &irq_cascade); setup_irq(CPU_IRQ_BASE + CPU_VRC5477_CASCADE, &irq_cascade);
/* hook up the first-level interrupt handler */ /* hook up the first-level interrupt handler */
set_except_vector(0, ddb5477_handle_int); set_except_vector(0, ddb5477_handle_int);

View file

@ -141,7 +141,7 @@ static void __init ddb_time_init(void)
/* mips_hpt_frequency is 1/2 of the cpu core freq */ /* mips_hpt_frequency is 1/2 of the cpu core freq */
i = (read_c0_config() >> 28 ) & 7; i = (read_c0_config() >> 28 ) & 7;
if ((current_cpu_data.cputype == CPU_R5432) && (i == 3)) if ((current_cpu_data.cputype == CPU_R5432) && (i == 3))
i = 4; i = 4;
mips_hpt_frequency = bus_frequency*(i+4)/4; mips_hpt_frequency = bus_frequency*(i+4)/4;
} }
@ -298,11 +298,11 @@ static void __init ddb5477_board_init(void)
if (mips_machtype == MACH_NEC_ROCKHOPPER if (mips_machtype == MACH_NEC_ROCKHOPPER
|| mips_machtype == MACH_NEC_ROCKHOPPERII) { || mips_machtype == MACH_NEC_ROCKHOPPERII) {
/* Disable bus diagnostics. */ /* Disable bus diagnostics. */
ddb_out32(DDB_PCICTL0_L, 0); ddb_out32(DDB_PCICTL0_L, 0);
ddb_out32(DDB_PCICTL0_H, 0); ddb_out32(DDB_PCICTL0_H, 0);
ddb_out32(DDB_PCICTL1_L, 0); ddb_out32(DDB_PCICTL1_L, 0);
ddb_out32(DDB_PCICTL1_H, 0); ddb_out32(DDB_PCICTL1_H, 0);
} }
if (mips_machtype == MACH_NEC_ROCKHOPPER) { if (mips_machtype == MACH_NEC_ROCKHOPPER) {
@ -354,7 +354,7 @@ static void __init ddb5477_board_init(void)
*/ */
pci_write_config_byte(&dev_m1533, 0x58, 0x74); pci_write_config_byte(&dev_m1533, 0x58, 0x74);
/* /*
* positive decode (bit6 -0) * positive decode (bit6 -0)
* enable IDE controler interrupt (bit 4 -1) * enable IDE controler interrupt (bit 4 -1)
* setup SIRQ to point to IRQ 14 (bit 3:0 - 1101) * setup SIRQ to point to IRQ 14 (bit 3:0 - 1101)
@ -364,31 +364,31 @@ static void __init ddb5477_board_init(void)
/* Setup M5229 registers */ /* Setup M5229 registers */
dev_m5229.bus = &bus; dev_m5229.bus = &bus;
dev_m5229.sysdata = NULL; dev_m5229.sysdata = NULL;
dev_m5229.devfn = 4*8; // slot 4 (AD15): M5229 IDE dev_m5229.devfn = 4*8; // slot 4 (AD15): M5229 IDE
/* /*
* enable IDE in the M5229 config register 0x50 (bit 0 - 1) * enable IDE in the M5229 config register 0x50 (bit 0 - 1)
* M5229 IDSEL is addr:15; see above setting * M5229 IDSEL is addr:15; see above setting
*/ */
pci_read_config_byte(&dev_m5229, 0x50, &temp8); pci_read_config_byte(&dev_m5229, 0x50, &temp8);
pci_write_config_byte(&dev_m5229, 0x50, temp8 | 0x1); pci_write_config_byte(&dev_m5229, 0x50, temp8 | 0x1);
/* /*
* enable bus master (bit 2) and IO decoding (bit 0) * enable bus master (bit 2) and IO decoding (bit 0)
*/ */
pci_read_config_byte(&dev_m5229, 0x04, &temp8); pci_read_config_byte(&dev_m5229, 0x04, &temp8);
pci_write_config_byte(&dev_m5229, 0x04, temp8 | 0x5); pci_write_config_byte(&dev_m5229, 0x04, temp8 | 0x5);
/* /*
* enable native, copied from arch/ppc/k2boot/head.S * enable native, copied from arch/ppc/k2boot/head.S
* TODO - need volatile, need to be portable * TODO - need volatile, need to be portable
*/ */
pci_write_config_byte(&dev_m5229, 0x09, 0xef); pci_write_config_byte(&dev_m5229, 0x09, 0xef);
/* Set Primary Channel Command Block Timing */ /* Set Primary Channel Command Block Timing */
pci_write_config_byte(&dev_m5229, 0x59, 0x31); pci_write_config_byte(&dev_m5229, 0x59, 0x31);
/* /*
* Enable primary channel 40-pin cable * Enable primary channel 40-pin cable
* M5229 register 0x4a (bit 0) * M5229 register 0x4a (bit 0)
*/ */

View file

@ -253,7 +253,7 @@ static inline void dec_kn03_be_init(void)
kn0x_erraddr = (void *)(KN03_SLOT_BASE + IOASIC_ERRADDR); kn0x_erraddr = (void *)(KN03_SLOT_BASE + IOASIC_ERRADDR);
kn0x_chksyn = (void *)(KN03_SLOT_BASE + IOASIC_CHKSYN); kn0x_chksyn = (void *)(KN03_SLOT_BASE + IOASIC_CHKSYN);
/* /*
* Set normal ECC detection and generation, enable ECC correction. * Set normal ECC detection and generation, enable ECC correction.
* For KN05 we also need to make sure EE (?) is enabled in the MB. * For KN05 we also need to make sure EE (?) is enabled in the MB.

View file

@ -129,7 +129,7 @@ static void __init it8172_setup(void)
/* /*
* IO/MEM resources. * IO/MEM resources.
* *
* revisit this area. * revisit this area.
*/ */
set_io_port_base(KSEG1); set_io_port_base(KSEG1);

View file

@ -72,7 +72,7 @@ static inline int rtc_dm_binary(void) { return saved_control & RTC_DM_BINARY; }
static inline unsigned char static inline unsigned char
bin_to_hw(unsigned char c) bin_to_hw(unsigned char c)
{ {
if (rtc_dm_binary()) if (rtc_dm_binary())
return c; return c;
else else
return ((c/10) << 4) + (c%10); return ((c/10) << 4) + (c%10);
@ -91,9 +91,9 @@ hw_to_bin(unsigned char c)
static inline unsigned char static inline unsigned char
hour_bin_to_hw(unsigned char c) hour_bin_to_hw(unsigned char c)
{ {
if (rtc_24h()) if (rtc_24h())
return bin_to_hw(c); return bin_to_hw(c);
if (c >= 12) if (c >= 12)
return 0x80 | bin_to_hw((c==12)?12:c-12); /* 12 is 12pm */ return 0x80 | bin_to_hw((c==12)?12:c-12); /* 12 is 12pm */
else else
return bin_to_hw((c==0)?12:c); /* 0 is 12 AM, not 0 am */ return bin_to_hw((c==0)?12:c); /* 0 is 12 AM, not 0 am */
@ -105,9 +105,9 @@ hour_hw_to_bin(unsigned char c)
unsigned char tmp = hw_to_bin(c&0x3f); unsigned char tmp = hw_to_bin(c&0x3f);
if (rtc_24h()) if (rtc_24h())
return tmp; return tmp;
if (c & 0x80) if (c & 0x80)
return (tmp==12)?12:tmp+12; /* 12pm is 12, not 24 */ return (tmp==12)?12:tmp+12; /* 12pm is 12, not 24 */
else else
return (tmp==12)?0:tmp; /* 12am is 0 */ return (tmp==12)?0:tmp; /* 12am is 0 */
} }
@ -145,7 +145,7 @@ static unsigned long __init cal_r4koff(void)
return (mips_hpt_frequency / HZ); return (mips_hpt_frequency / HZ);
} }
static unsigned long static unsigned long
it8172_rtc_get_time(void) it8172_rtc_get_time(void)
{ {
unsigned int year, mon, day, hour, min, sec; unsigned int year, mon, day, hour, min, sec;
@ -166,12 +166,12 @@ it8172_rtc_get_time(void)
hour = hour_hw_to_bin(CMOS_READ(RTC_HOURS)); hour = hour_hw_to_bin(CMOS_READ(RTC_HOURS));
day = hw_to_bin(CMOS_READ(RTC_DAY_OF_MONTH)); day = hw_to_bin(CMOS_READ(RTC_DAY_OF_MONTH));
mon = hw_to_bin(CMOS_READ(RTC_MONTH)); mon = hw_to_bin(CMOS_READ(RTC_MONTH));
year = hw_to_bin(CMOS_READ(RTC_YEAR)) + year = hw_to_bin(CMOS_READ(RTC_YEAR)) +
hw_to_bin(*rtc_century_reg) * 100; hw_to_bin(*rtc_century_reg) * 100;
/* restore interrupts */ /* restore interrupts */
local_irq_restore(flags); local_irq_restore(flags);
return mktime(year, mon, day, hour, min, sec); return mktime(year, mon, day, hour, min, sec);
} }

View file

@ -103,7 +103,7 @@ jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value)
* Convert jiffies to nanoseconds and seperate with * Convert jiffies to nanoseconds and seperate with
* one divide. * one divide.
*/ */
u64 nsec = (u64)jiffies * TICK_NSEC; u64 nsec = (u64)jiffies * TICK_NSEC;
value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &value->tv_usec); value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &value->tv_usec);
value->tv_usec /= NSEC_PER_USEC; value->tv_usec /= NSEC_PER_USEC;
} }

View file

@ -105,7 +105,7 @@ jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value)
* Convert jiffies to nanoseconds and seperate with * Convert jiffies to nanoseconds and seperate with
* one divide. * one divide.
*/ */
u64 nsec = (u64)jiffies * TICK_NSEC; u64 nsec = (u64)jiffies * TICK_NSEC;
value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &value->tv_usec); value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &value->tv_usec);
value->tv_usec /= NSEC_PER_USEC; value->tv_usec /= NSEC_PER_USEC;
} }

View file

@ -137,7 +137,7 @@ static inline void check_mult_sh(void)
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
if (v1[i] != w[i]) if (v1[i] != w[i])
bug = 1; bug = 1;
if (bug == 0) { if (bug == 0) {
printk("no.\n"); printk("no.\n");
return; return;
@ -149,7 +149,7 @@ static inline void check_mult_sh(void)
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
if (v2[i] != w[i]) if (v2[i] != w[i])
fix = 0; fix = 0;
if (fix == 1) { if (fix == 1) {
printk("yes.\n"); printk("yes.\n");
return; return;

View file

@ -687,8 +687,8 @@ void handle_exception (struct gdb_regs *regs)
* acquire the big kgdb spinlock * acquire the big kgdb spinlock
*/ */
if (!spin_trylock(&kgdb_lock)) { if (!spin_trylock(&kgdb_lock)) {
/* /*
* some other CPU has the lock, we should go back to * some other CPU has the lock, we should go back to
* receive the gdb_wait IPC * receive the gdb_wait IPC
*/ */
return; return;
@ -703,7 +703,7 @@ void handle_exception (struct gdb_regs *regs)
async_bp.addr = 0; async_bp.addr = 0;
} }
/* /*
* acquire the CPU spinlocks * acquire the CPU spinlocks
*/ */
for (i = num_online_cpus()-1; i >= 0; i--) for (i = num_online_cpus()-1; i >= 0; i--)
@ -894,7 +894,7 @@ void handle_exception (struct gdb_regs *regs)
ptr = &input_buffer[1]; ptr = &input_buffer[1];
if (hexToLong(&ptr, &addr)) if (hexToLong(&ptr, &addr))
regs->cp0_epc = addr; regs->cp0_epc = addr;
goto exit_kgdb_exception; goto exit_kgdb_exception;
break; break;
@ -1001,7 +1001,7 @@ void breakpoint(void)
return; return;
__asm__ __volatile__( __asm__ __volatile__(
".globl breakinst\n\t" ".globl breakinst\n\t"
".set\tnoreorder\n\t" ".set\tnoreorder\n\t"
"nop\n" "nop\n"
"breakinst:\tbreak\n\t" "breakinst:\tbreak\n\t"
@ -1014,7 +1014,7 @@ void breakpoint(void)
void async_breakpoint(void) void async_breakpoint(void)
{ {
__asm__ __volatile__( __asm__ __volatile__(
".globl async_breakinst\n\t" ".globl async_breakinst\n\t"
".set\tnoreorder\n\t" ".set\tnoreorder\n\t"
"nop\n" "nop\n"
"async_breakinst:\tbreak\n\t" "async_breakinst:\tbreak\n\t"

View file

@ -246,10 +246,10 @@ NESTED(nmi_handler, PT_SIZE, sp)
LONG_L a1, PT_EPC(sp) LONG_L a1, PT_EPC(sp)
#if CONFIG_32BIT #if CONFIG_32BIT
PRINT("Got \nexception at %08lx\012") PRINT("Got \nexception at %08lx\012")
#endif #endif
#if CONFIG_64BIT #if CONFIG_64BIT
PRINT("Got \nexception at %016lx\012") PRINT("Got \nexception at %016lx\012")
#endif #endif
.endm .endm
.macro __BUILD_count exception .macro __BUILD_count exception

View file

@ -27,7 +27,7 @@ long sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg);
#include "compat_ioctl.c" #include "compat_ioctl.c"
typedef int (* ioctl32_handler_t)(unsigned int, unsigned int, unsigned long, struct file *); typedef int (* ioctl32_handler_t)(unsigned int, unsigned int, unsigned long, struct file *);
#define COMPATIBLE_IOCTL(cmd) HANDLE_IOCTL((cmd),sys_ioctl) #define COMPATIBLE_IOCTL(cmd) HANDLE_IOCTL((cmd),sys_ioctl)
#define HANDLE_IOCTL(cmd,handler) { (cmd), (ioctl32_handler_t)(handler), NULL }, #define HANDLE_IOCTL(cmd,handler) { (cmd), (ioctl32_handler_t)(handler), NULL },
#define IOCTL_TABLE_START \ #define IOCTL_TABLE_START \

View file

@ -77,7 +77,7 @@ int show_interrupts(struct seq_file *p, void *v)
if (i < NR_IRQS) { if (i < NR_IRQS) {
spin_lock_irqsave(&irq_desc[i].lock, flags); spin_lock_irqsave(&irq_desc[i].lock, flags);
action = irq_desc[i].action; action = irq_desc[i].action;
if (!action) if (!action)
goto skip; goto skip;
seq_printf(p, "%3d: ",i); seq_printf(p, "%3d: ",i);
#ifndef CONFIG_SMP #ifndef CONFIG_SMP

View file

@ -313,7 +313,7 @@ asmlinkage int sys32_sysinfo(struct sysinfo32 *info)
struct sysinfo s; struct sysinfo s;
int ret, err; int ret, err;
mm_segment_t old_fs = get_fs (); mm_segment_t old_fs = get_fs ();
set_fs (KERNEL_DS); set_fs (KERNEL_DS);
ret = sys_sysinfo(&s); ret = sys_sysinfo(&s);
set_fs (old_fs); set_fs (old_fs);
@ -560,7 +560,7 @@ struct ipc64_perm32 {
compat_gid_t gid; compat_gid_t gid;
compat_uid_t cuid; compat_uid_t cuid;
compat_gid_t cgid; compat_gid_t cgid;
compat_mode_t mode; compat_mode_t mode;
unsigned short seq; unsigned short seq;
unsigned short __pad1; unsigned short __pad1;
unsigned int __unused1; unsigned int __unused1;
@ -1334,17 +1334,17 @@ asmlinkage int sys32_sendfile(int out_fd, int in_fd, compat_off_t *offset,
mm_segment_t old_fs = get_fs(); mm_segment_t old_fs = get_fs();
int ret; int ret;
off_t of; off_t of;
if (offset && get_user(of, offset)) if (offset && get_user(of, offset))
return -EFAULT; return -EFAULT;
set_fs(KERNEL_DS); set_fs(KERNEL_DS);
ret = sys_sendfile(out_fd, in_fd, offset ? &of : NULL, count); ret = sys_sendfile(out_fd, in_fd, offset ? &of : NULL, count);
set_fs(old_fs); set_fs(old_fs);
if (offset && put_user(of, offset)) if (offset && put_user(of, offset))
return -EFAULT; return -EFAULT;
return ret; return ret;
} }
@ -1362,11 +1362,11 @@ static unsigned char socketcall_nargs[18]={AL(0),AL(3),AL(3),AL(3),AL(2),AL(3),
#undef AL #undef AL
/* /*
* System call vectors. * System call vectors.
* *
* Argument checking cleaned up. Saved 20% in size. * Argument checking cleaned up. Saved 20% in size.
* This function doesn't need to set the kernel lock because * This function doesn't need to set the kernel lock because
* it is set by the callees. * it is set by the callees.
*/ */
asmlinkage long sys32_socketcall(int call, unsigned int *args32) asmlinkage long sys32_socketcall(int call, unsigned int *args32)
@ -1402,11 +1402,11 @@ asmlinkage long sys32_socketcall(int call, unsigned int *args32)
/* copy_from_user should be SMP safe. */ /* copy_from_user should be SMP safe. */
if (copy_from_user(a, args32, socketcall_nargs[call])) if (copy_from_user(a, args32, socketcall_nargs[call]))
return -EFAULT; return -EFAULT;
a0=a[0]; a0=a[0];
a1=a[1]; a1=a[1];
switch(call) switch(call)
{ {
case SYS_SOCKET: case SYS_SOCKET:
err = sys_socket(a0,a1,a[2]); err = sys_socket(a0,a1,a[2]);

View file

@ -35,7 +35,7 @@
/* /*
* FPU context is saved iff the process has used it's FPU in the current * FPU context is saved iff the process has used it's FPU in the current
* time slice as indicated by TIF_USEDFPU. In any case, the CU1 bit for user * time slice as indicated by TIF_USEDFPU. In any case, the CU1 bit for user
* space STATUS register should be 0, so that a process *always* starts its * space STATUS register should be 0, so that a process *always* starts its
* userland with FPU disabled after each context switch. * userland with FPU disabled after each context switch.
* *
* FPU will be enabled as soon as the process accesses FPU again, through * FPU will be enabled as soon as the process accesses FPU again, through
@ -55,7 +55,7 @@ LEAF(resume)
cpu_save_nonscratch a0 cpu_save_nonscratch a0
sw ra, THREAD_REG31(a0) sw ra, THREAD_REG31(a0)
/* /*
* check if we need to save FPU registers * check if we need to save FPU registers
*/ */
lw t3, TASK_THREAD_INFO(a0) lw t3, TASK_THREAD_INFO(a0)

View file

@ -33,7 +33,7 @@
/* /*
* FPU context is saved iff the process has used it's FPU in the current * FPU context is saved iff the process has used it's FPU in the current
* time slice as indicated by _TIF_USEDFPU. In any case, the CU1 bit for user * time slice as indicated by _TIF_USEDFPU. In any case, the CU1 bit for user
* space STATUS register should be 0, so that a process *always* starts its * space STATUS register should be 0, so that a process *always* starts its
* userland with FPU disabled after each context switch. * userland with FPU disabled after each context switch.
* *
* FPU will be enabled as soon as the process accesses FPU again, through * FPU will be enabled as soon as the process accesses FPU again, through
@ -164,7 +164,7 @@ LEAF(_init_fpu)
dmtc1 t1, $f31 dmtc1 t1, $f31
1: 1:
#endif #endif
#ifdef CONFIG_CPU_MIPS32 #ifdef CONFIG_CPU_MIPS32
mtc1 t1, $f0 mtc1 t1, $f0
mtc1 t1, $f1 mtc1 t1, $f1

View file

@ -558,7 +558,7 @@ static inline int setup_sigcontext32(struct pt_regs *regs,
if (!used_math()) if (!used_math())
goto out; goto out;
/* /*
* Save FPU state to signal context. Signal handler will "inherit" * Save FPU state to signal context. Signal handler will "inherit"
* current FPU state. * current FPU state.
*/ */

View file

@ -15,7 +15,7 @@ SECTIONS
/* This is the value for an Origin kernel, taken from an IRIX kernel. */ /* This is the value for an Origin kernel, taken from an IRIX kernel. */
/* . = 0xc00000000001c000; */ /* . = 0xc00000000001c000; */
/* Set the vaddr for the text segment to a value /* Set the vaddr for the text segment to a value
>= 0xa800 0000 0001 9000 if no symmon is going to configured >= 0xa800 0000 0001 9000 if no symmon is going to configured
>= 0xa800 0000 0030 0000 otherwise */ >= 0xa800 0000 0030 0000 otherwise */

View file

@ -1,7 +1,7 @@
/* /*
* Atmel AT93C46 serial eeprom driver * Atmel AT93C46 serial eeprom driver
* *
* Brian Murphy <brian.murphy@eicon.com> * Brian Murphy <brian.murphy@eicon.com>
* *
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
@ -21,12 +21,12 @@
struct at93c_defs *at93c; struct at93c_defs *at93c;
static void at93c_reg_write(u32 val) static void at93c_reg_write(u32 val)
{ {
*at93c->reg = val; *at93c->reg = val;
} }
static u32 at93c_reg_read(void) static u32 at93c_reg_read(void)
{ {
u32 tmp = *at93c->reg; u32 tmp = *at93c->reg;
return tmp; return tmp;
@ -81,7 +81,7 @@ static u8 at93c_read_byte(void)
} }
static void at93c_write_bits(u32 data, int size) static void at93c_write_bits(u32 data, int size)
{ {
int i; int i;
int shift = size - 1; int shift = size - 1;
u32 mask = (1 << shift); u32 mask = (1 << shift);
@ -90,7 +90,7 @@ static void at93c_write_bits(u32 data, int size)
at93c_write_databit((data & mask) >> shift); at93c_write_databit((data & mask) >> shift);
data <<= 1; data <<= 1;
} }
} }
static void at93c_init_op(void) static void at93c_init_op(void)
{ {
@ -104,8 +104,8 @@ static void at93c_end_op(void)
lasat_ndelay(250); lasat_ndelay(250);
} }
static void at93c_wait(void) static void at93c_wait(void)
{ {
at93c_init_op(); at93c_init_op();
while (!at93c_read_databit()) while (!at93c_read_databit())
; ;

View file

@ -1,7 +1,7 @@
/* /*
* Atmel AT93C46 serial eeprom driver * Atmel AT93C46 serial eeprom driver
* *
* Brian Murphy <brian.murphy@eicon.com> * Brian Murphy <brian.murphy@eicon.com>
* *
*/ */

View file

@ -1,7 +1,7 @@
/* /*
* Dallas Semiconductors 1603 RTC driver * Dallas Semiconductors 1603 RTC driver
* *
* Brian Murphy <brian@murphy.dk> * Brian Murphy <brian@murphy.dk>
* *
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
@ -20,12 +20,12 @@
struct ds_defs *ds1603 = NULL; struct ds_defs *ds1603 = NULL;
/* HW specific register functions */ /* HW specific register functions */
static void rtc_reg_write(unsigned long val) static void rtc_reg_write(unsigned long val)
{ {
*ds1603->reg = val; *ds1603->reg = val;
} }
static unsigned long rtc_reg_read(void) static unsigned long rtc_reg_read(void)
{ {
unsigned long tmp = *ds1603->reg; unsigned long tmp = *ds1603->reg;
return tmp; return tmp;
@ -80,7 +80,7 @@ static unsigned int rtc_read_databit(void)
{ {
unsigned int data; unsigned int data;
data = (rtc_datareg_read() & (1 << ds1603->data_read_shift)) data = (rtc_datareg_read() & (1 << ds1603->data_read_shift))
>> ds1603->data_read_shift; >> ds1603->data_read_shift;
rtc_cycle_clock(rtc_reg_read()); rtc_cycle_clock(rtc_reg_read());
return data; return data;

View file

@ -1,7 +1,7 @@
/* /*
* Dallas Semiconductors 1603 RTC driver * Dallas Semiconductors 1603 RTC driver
* *
* Brian Murphy <brian@murphy.dk> * Brian Murphy <brian@murphy.dk>
* *
*/ */
#ifndef __DS1603_H #ifndef __DS1603_H

View file

@ -21,7 +21,7 @@ LDSCRIPT= -L$(obj) -Tromscript.normal
HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \ HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \
-D_kernel_entry=0x$(KERNEL_ENTRY) \ -D_kernel_entry=0x$(KERNEL_ENTRY) \
-D VERSION="\"$(Version)\"" \ -D VERSION="\"$(Version)\"" \
-D TIMESTAMP=$(shell date +%s) -D TIMESTAMP=$(shell date +%s)
$(obj)/head.o: $(obj)/head.S $(KERNEL_IMAGE) $(obj)/head.o: $(obj)/head.S $(KERNEL_IMAGE)
$(CC) -fno-pic $(HEAD_DEFINES) -I$(TOPDIR)/include -c -o $@ $< $(CC) -fno-pic $(HEAD_DEFINES) -I$(TOPDIR)/include -c -o $@ $<

View file

@ -27,5 +27,5 @@ reldate:
.word TIMESTAMP .word TIMESTAMP
.org 0x50 .org 0x50
release: release:
.string VERSION .string VERSION

View file

@ -15,7 +15,7 @@
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
* *
* Routines for generic manipulation of the interrupts found on the * Routines for generic manipulation of the interrupts found on the
* Lasat boards. * Lasat boards.
*/ */
#include <linux/init.h> #include <linux/init.h>
@ -101,7 +101,7 @@ static unsigned long get_int_status_100(void)
return *lasat_int_status & *lasat_int_mask; return *lasat_int_status & *lasat_int_mask;
} }
static unsigned long get_int_status_200(void) static unsigned long get_int_status_200(void)
{ {
unsigned long int_status; unsigned long int_status;

View file

@ -67,7 +67,7 @@ static void init_flash_sizes(void)
if (mips_machtype == MACH_LASAT_100) { if (mips_machtype == MACH_LASAT_100) {
lasat_board_info.li_flash_base = 0x1e000000; lasat_board_info.li_flash_base = 0x1e000000;
lb[LASAT_MTD_BOOTLOADER] = 0x1e400000; lb[LASAT_MTD_BOOTLOADER] = 0x1e400000;
if (lasat_board_info.li_flash_size > 0x200000) { if (lasat_board_info.li_flash_size > 0x200000) {
@ -103,7 +103,7 @@ int lasat_init_board_info(void)
memset(&lasat_board_info, 0, sizeof(lasat_board_info)); memset(&lasat_board_info, 0, sizeof(lasat_board_info));
/* First read the EEPROM info */ /* First read the EEPROM info */
EEPROMRead(0, (unsigned char *)&lasat_board_info.li_eeprom_info, EEPROMRead(0, (unsigned char *)&lasat_board_info.li_eeprom_info,
sizeof(struct lasat_eeprom_struct)); sizeof(struct lasat_eeprom_struct));
/* Check the CRC */ /* Check the CRC */
@ -188,7 +188,7 @@ int lasat_init_board_info(void)
case 0x1: case 0x1:
lasat_board_info.li_cpu_hz = lasat_board_info.li_cpu_hz =
lasat_board_info.li_bus_hz + lasat_board_info.li_bus_hz +
(lasat_board_info.li_bus_hz >> 1); (lasat_board_info.li_bus_hz >> 1);
break; break;
case 0x2: case 0x2:
lasat_board_info.li_cpu_hz = lasat_board_info.li_cpu_hz =
@ -271,7 +271,7 @@ void lasat_write_eeprom_info(void)
lasat_board_info.li_eeprom_info.crc32 = crc; lasat_board_info.li_eeprom_info.crc32 = crc;
/* Write the EEPROM info */ /* Write the EEPROM info */
EEPROMWrite(0, (unsigned char *)&lasat_board_info.li_eeprom_info, EEPROMWrite(0, (unsigned char *)&lasat_board_info.li_eeprom_info,
sizeof(struct lasat_eeprom_struct)); sizeof(struct lasat_eeprom_struct));
} }

View file

@ -1,7 +1,7 @@
/* /*
* Picvue PVC160206 display driver * Picvue PVC160206 display driver
* *
* Brian Murphy <brian@murphy.dk> * Brian Murphy <brian@murphy.dk>
* *
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
@ -24,12 +24,12 @@ struct pvc_defs *picvue = NULL;
DECLARE_MUTEX(pvc_sem); DECLARE_MUTEX(pvc_sem);
static void pvc_reg_write(u32 val) static void pvc_reg_write(u32 val)
{ {
*picvue->reg = val; *picvue->reg = val;
} }
static u32 pvc_reg_read(void) static u32 pvc_reg_read(void)
{ {
u32 tmp = *picvue->reg; u32 tmp = *picvue->reg;
return tmp; return tmp;
@ -65,12 +65,12 @@ static u8 pvc_read_data(void)
{ {
u32 data = pvc_reg_read(); u32 data = pvc_reg_read();
u8 byte; u8 byte;
data |= picvue->rw; data |= picvue->rw;
data &= ~picvue->rs; data &= ~picvue->rs;
pvc_reg_write(data); pvc_reg_write(data);
ndelay(40); ndelay(40);
byte = pvc_read_byte(data); byte = pvc_read_byte(data);
data |= picvue->rs; data |= picvue->rs;
pvc_reg_write(data); pvc_reg_write(data);
return byte; return byte;
} }

View file

@ -1,7 +1,7 @@
/* /*
* Picvue PVC160206 display driver * Picvue PVC160206 display driver
* *
* Brian Murphy <brian.murphy@eicon.com> * Brian Murphy <brian.murphy@eicon.com>
* *
*/ */
#include <asm/semaphore.h> #include <asm/semaphore.h>

View file

@ -1,7 +1,7 @@
/* /*
* Picvue PVC160206 display driver * Picvue PVC160206 display driver
* *
* Brian Murphy <brian.murphy@eicon.com> * Brian Murphy <brian.murphy@eicon.com>
* *
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
@ -51,10 +51,10 @@ static int pvc_proc_read_line(char *page, char **start,
page += sprintf(page, "%s\n", pvc_lines[lineno]); page += sprintf(page, "%s\n", pvc_lines[lineno]);
up(&pvc_sem); up(&pvc_sem);
return page - origpage; return page - origpage;
} }
static int pvc_proc_write_line(struct file *file, const char *buffer, static int pvc_proc_write_line(struct file *file, const char *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
int origcount = count; int origcount = count;
@ -119,7 +119,7 @@ static int pvc_proc_read_scroll(char *page, char **start,
page += sprintf(page, "%d\n", scroll_dir * scroll_interval); page += sprintf(page, "%d\n", scroll_dir * scroll_interval);
up(&pvc_sem); up(&pvc_sem);
return page - origpage; return page - origpage;
} }

View file

@ -42,7 +42,7 @@ static void null_prom_putc(char c)
/* these are functions provided by the bootloader */ /* these are functions provided by the bootloader */
static void (* prom_putc)(char c) = null_prom_putc; static void (* prom_putc)(char c) = null_prom_putc;
void (* prom_printf)(const char * fmt, ...) = null_prom_printf; void (* prom_printf)(const char * fmt, ...) = null_prom_printf;
void (* prom_display)(const char *string, int pos, int clear) = void (* prom_display)(const char *string, int pos, int clear) =
null_prom_display; null_prom_display;
void (* prom_monitor)(void) = null_prom_monitor; void (* prom_monitor)(void) = null_prom_monitor;

View file

@ -1,4 +1,4 @@
/* /*
* Thomas Horsten <thh@lasat.com> * Thomas Horsten <thh@lasat.com>
* Copyright (C) 2000 LASAT Networks A/S. * Copyright (C) 2000 LASAT Networks A/S.
* *

View file

@ -105,7 +105,7 @@ static int lasat_panic_prom_monitor(struct notifier_block *this,
return NOTIFY_DONE; return NOTIFY_DONE;
} }
static struct notifier_block lasat_panic_block[] = static struct notifier_block lasat_panic_block[] =
{ {
{ lasat_panic_display, NULL, INT_MAX }, { lasat_panic_display, NULL, INT_MAX },
{ lasat_panic_prom_monitor, NULL, INT_MIN } { lasat_panic_prom_monitor, NULL, INT_MIN }
@ -120,7 +120,7 @@ static void lasat_timer_setup(struct irqaction *irq)
{ {
write_c0_compare( write_c0_compare(
read_c0_count() + read_c0_count() +
mips_hpt_frequency / HZ); mips_hpt_frequency / HZ);
change_c0_status(ST0_IM, IE_IRQ0 | IE_IRQ5); change_c0_status(ST0_IM, IE_IRQ0 | IE_IRQ5);
} }

View file

@ -37,14 +37,14 @@
static DECLARE_MUTEX(lasat_info_sem); static DECLARE_MUTEX(lasat_info_sem);
/* Strategy function to write EEPROM after changing string entry */ /* Strategy function to write EEPROM after changing string entry */
int sysctl_lasatstring(ctl_table *table, int *name, int nlen, int sysctl_lasatstring(ctl_table *table, int *name, int nlen,
void *oldval, size_t *oldlenp, void *oldval, size_t *oldlenp,
void *newval, size_t newlen, void **context) void *newval, size_t newlen, void **context)
{ {
int r; int r;
down(&lasat_info_sem); down(&lasat_info_sem);
r = sysctl_string(table, name, r = sysctl_string(table, name,
nlen, oldval, oldlenp, newval, newlen, context); nlen, oldval, oldlenp, newval, newlen, context);
if (r < 0) { if (r < 0) {
up(&lasat_info_sem); up(&lasat_info_sem);
@ -74,7 +74,7 @@ int proc_dolasatstring(ctl_table *table, int write, struct file *filp,
return 0; return 0;
} }
/* proc function to write EEPROM after changing int entry */ /* proc function to write EEPROM after changing int entry */
int proc_dolasatint(ctl_table *table, int write, struct file *filp, int proc_dolasatint(ctl_table *table, int write, struct file *filp,
void *buffer, size_t *lenp, loff_t *ppos) void *buffer, size_t *lenp, loff_t *ppos)
{ {
@ -93,7 +93,7 @@ int proc_dolasatint(ctl_table *table, int write, struct file *filp,
static int rtctmp; static int rtctmp;
#ifdef CONFIG_DS1603 #ifdef CONFIG_DS1603
/* proc function to read/write RealTime Clock */ /* proc function to read/write RealTime Clock */
int proc_dolasatrtc(ctl_table *table, int write, struct file *filp, int proc_dolasatrtc(ctl_table *table, int write, struct file *filp,
void *buffer, size_t *lenp, loff_t *ppos) void *buffer, size_t *lenp, loff_t *ppos)
{ {
@ -165,9 +165,9 @@ static char lasat_bcastaddr[16];
void update_bcastaddr(void) void update_bcastaddr(void)
{ {
unsigned int ip; unsigned int ip;
ip = (lasat_board_info.li_eeprom_info.ipaddr & ip = (lasat_board_info.li_eeprom_info.ipaddr &
lasat_board_info.li_eeprom_info.netmask) | lasat_board_info.li_eeprom_info.netmask) |
~lasat_board_info.li_eeprom_info.netmask; ~lasat_board_info.li_eeprom_info.netmask;
sprintf(lasat_bcastaddr, "%d.%d.%d.%d", sprintf(lasat_bcastaddr, "%d.%d.%d.%d",
@ -205,7 +205,7 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp,
break; break;
len++; len++;
} }
if (len >= sizeof(proc_lasat_ipbuf)-1) if (len >= sizeof(proc_lasat_ipbuf)-1)
len = sizeof(proc_lasat_ipbuf) - 1; len = sizeof(proc_lasat_ipbuf) - 1;
if (copy_from_user(proc_lasat_ipbuf, buffer, len)) if (copy_from_user(proc_lasat_ipbuf, buffer, len))
{ {
@ -249,8 +249,8 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp,
} }
#endif /* defined(CONFIG_INET) */ #endif /* defined(CONFIG_INET) */
static int sysctl_lasat_eeprom_value(ctl_table *table, int *name, int nlen, static int sysctl_lasat_eeprom_value(ctl_table *table, int *name, int nlen,
void *oldval, size_t *oldlenp, void *oldval, size_t *oldlenp,
void *newval, size_t newlen, void *newval, size_t newlen,
void **context) void **context)
{ {
@ -293,7 +293,7 @@ int proc_lasat_eeprom_value(ctl_table *table, int write, struct file *filp,
if (!strcmp(filp->f_dentry->d_name.name, "debugaccess")) if (!strcmp(filp->f_dentry->d_name.name, "debugaccess"))
lasat_board_info.li_eeprom_info.debugaccess = lasat_board_info.li_debugaccess; lasat_board_info.li_eeprom_info.debugaccess = lasat_board_info.li_debugaccess;
} }
lasat_write_eeprom_info(); lasat_write_eeprom_info();
up(&lasat_info_sem); up(&lasat_info_sem);
return 0; return 0;
} }
@ -316,8 +316,8 @@ static ctl_table lasat_table[] = {
0644, NULL, &proc_lasat_ip, &sysctl_lasat_intvec}, 0644, NULL, &proc_lasat_ip, &sysctl_lasat_intvec},
{LASAT_NETMASK, "netmask", &lasat_board_info.li_eeprom_info.netmask, sizeof(int), {LASAT_NETMASK, "netmask", &lasat_board_info.li_eeprom_info.netmask, sizeof(int),
0644, NULL, &proc_lasat_ip, &sysctl_lasat_intvec}, 0644, NULL, &proc_lasat_ip, &sysctl_lasat_intvec},
{LASAT_BCAST, "bcastaddr", &lasat_bcastaddr, {LASAT_BCAST, "bcastaddr", &lasat_bcastaddr,
sizeof(lasat_bcastaddr), 0600, NULL, sizeof(lasat_bcastaddr), 0600, NULL,
&proc_dostring, &sysctl_string}, &proc_dostring, &sysctl_string},
#endif #endif
{LASAT_PASSWORD, "passwd_hash", &lasat_board_info.li_eeprom_info.passwd_hash, sizeof(lasat_board_info.li_eeprom_info.passwd_hash), {LASAT_PASSWORD, "passwd_hash", &lasat_board_info.li_eeprom_info.passwd_hash, sizeof(lasat_board_info.li_eeprom_info.passwd_hash),

View file

@ -2,7 +2,7 @@
# Makefile for MIPS-specific library files.. # Makefile for MIPS-specific library files..
# #
lib-y += csum_partial.o memset.o watch.o lib-y += csum_partial.o memset.o watch.o
obj-$(CONFIG_CPU_MIPS32) += dump_tlb.o obj-$(CONFIG_CPU_MIPS32) += dump_tlb.o
obj-$(CONFIG_CPU_MIPS64) += dump_tlb.o obj-$(CONFIG_CPU_MIPS64) += dump_tlb.o

View file

@ -2,7 +2,7 @@
# Makefile for MIPS-specific library files.. # Makefile for MIPS-specific library files..
# #
lib-y += csum_partial.o memset.o watch.o lib-y += csum_partial.o memset.o watch.o
obj-$(CONFIG_CPU_MIPS32) += dump_tlb.o obj-$(CONFIG_CPU_MIPS32) += dump_tlb.o
obj-$(CONFIG_CPU_MIPS64) += dump_tlb.o obj-$(CONFIG_CPU_MIPS64) += dump_tlb.o

View file

@ -101,7 +101,7 @@
#define NBYTES 8 #define NBYTES 8
#define LOG_NBYTES 3 #define LOG_NBYTES 3
/* /*
* As we are sharing code base with the mips32 tree (which use the o32 ABI * As we are sharing code base with the mips32 tree (which use the o32 ABI
* register definitions). We need to redefine the register definitions from * register definitions). We need to redefine the register definitions from
* the n64 ABI register naming to the o32 ABI register naming. * the n64 ABI register naming to the o32 ABI register naming.
@ -118,7 +118,7 @@
#define t5 $13 #define t5 $13
#define t6 $14 #define t6 $14
#define t7 $15 #define t7 $15
#else #else
#define LOAD lw #define LOAD lw

View file

@ -122,7 +122,7 @@ void __init arch_init_irq(void)
int i; int i;
atlas_hw0_icregs = (struct atlas_ictrl_regs *)ioremap (ATLAS_ICTRL_REGS_BASE, sizeof(struct atlas_ictrl_regs *)); atlas_hw0_icregs = (struct atlas_ictrl_regs *)ioremap (ATLAS_ICTRL_REGS_BASE, sizeof(struct atlas_ictrl_regs *));
/* /*
* Mask out all interrupt by writing "1" to all bit position in * Mask out all interrupt by writing "1" to all bit position in
* the interrupt reset reg. * the interrupt reset reg.

View file

@ -200,7 +200,7 @@ void __init kgdb_config (void)
generic_putDebugChar = saa9730_putDebugChar; generic_putDebugChar = saa9730_putDebugChar;
generic_getDebugChar = saa9730_getDebugChar; generic_getDebugChar = saa9730_getDebugChar;
} }
else else
#endif #endif
{ {
speed = rs_kgdb_hook(line, speed); speed = rs_kgdb_hook(line, speed);
@ -243,7 +243,7 @@ void __init prom_init(void)
mips_revision_corid = MIPS_REVISION_CORID; mips_revision_corid = MIPS_REVISION_CORID;
if (mips_revision_corid == MIPS_REVISION_CORID_CORE_EMUL) { if (mips_revision_corid == MIPS_REVISION_CORID_CORE_EMUL) {
if (BONITO_PCIDID == 0x0001df53 || if (BONITO_PCIDID == 0x0001df53 ||
BONITO_PCIDID == 0x0003df53) BONITO_PCIDID == 0x0003df53)
mips_revision_corid = MIPS_REVISION_CORID_CORE_EMUL_BON; mips_revision_corid = MIPS_REVISION_CORID_CORE_EMUL_BON;
else else
@ -310,7 +310,7 @@ void __init prom_init(void)
case MIPS_REVISION_CORID_CORE_MSC: case MIPS_REVISION_CORID_CORE_MSC:
case MIPS_REVISION_CORID_CORE_FPGA2: case MIPS_REVISION_CORID_CORE_FPGA2:
case MIPS_REVISION_CORID_CORE_EMUL_MSC: case MIPS_REVISION_CORID_CORE_EMUL_MSC:
_pcictrl_msc = (unsigned long)ioremap(MIPS_MSC01_PCI_REG_BASE, 0x2000); _pcictrl_msc = (unsigned long)ioremap(MIPS_MSC01_PCI_REG_BASE, 0x2000);
#ifdef CONFIG_CPU_LITTLE_ENDIAN #ifdef CONFIG_CPU_LITTLE_ENDIAN
MSC_WRITE(MSC01_PCI_SWAP, MSC01_PCI_SWAP_NOSWAP); MSC_WRITE(MSC01_PCI_SWAP, MSC01_PCI_SWAP_NOSWAP);

View file

@ -89,7 +89,7 @@ static unsigned int __init estimate_cpu_frequency(void)
* really calculate the timer frequency * really calculate the timer frequency
* For now we hardwire the SEAD board frequency to 12MHz. * For now we hardwire the SEAD board frequency to 12MHz.
*/ */
if ((prid == (PRID_COMP_MIPS | PRID_IMP_20KC)) || if ((prid == (PRID_COMP_MIPS | PRID_IMP_20KC)) ||
(prid == (PRID_COMP_MIPS | PRID_IMP_25KF))) (prid == (PRID_COMP_MIPS | PRID_IMP_25KF)))
count = 12000000; count = 12000000;

View file

@ -149,15 +149,15 @@ static int __init malta_setup(void)
argptr = prom_getcmdline(); argptr = prom_getcmdline();
if (strstr(argptr, "iobcuncached")) { if (strstr(argptr, "iobcuncached")) {
BONITO_PCICACHECTRL &= ~BONITO_PCICACHECTRL_IOBCCOH_EN; BONITO_PCICACHECTRL &= ~BONITO_PCICACHECTRL_IOBCCOH_EN;
BONITO_PCIMEMBASECFG = BONITO_PCIMEMBASECFG & BONITO_PCIMEMBASECFG = BONITO_PCIMEMBASECFG &
~(BONITO_PCIMEMBASECFG_MEMBASE0_CACHED | ~(BONITO_PCIMEMBASECFG_MEMBASE0_CACHED |
BONITO_PCIMEMBASECFG_MEMBASE1_CACHED); BONITO_PCIMEMBASECFG_MEMBASE1_CACHED);
printk("Disabled Bonito IOBC coherency\n"); printk("Disabled Bonito IOBC coherency\n");
} }
else { else {
BONITO_PCICACHECTRL |= BONITO_PCICACHECTRL_IOBCCOH_EN; BONITO_PCICACHECTRL |= BONITO_PCICACHECTRL_IOBCCOH_EN;
BONITO_PCIMEMBASECFG |= BONITO_PCIMEMBASECFG |=
(BONITO_PCIMEMBASECFG_MEMBASE0_CACHED | (BONITO_PCIMEMBASECFG_MEMBASE0_CACHED |
BONITO_PCIMEMBASECFG_MEMBASE1_CACHED); BONITO_PCIMEMBASECFG_MEMBASE1_CACHED);
printk("Disabled Bonito IOBC coherency\n"); printk("Disabled Bonito IOBC coherency\n");
} }

View file

@ -126,13 +126,13 @@ static inline void tx49_blast_icache32(void)
CACHE32_UNROLL32_ALIGN2; CACHE32_UNROLL32_ALIGN2;
/* I'm in even chunk. blast odd chunks */ /* I'm in even chunk. blast odd chunks */
for (ws = 0; ws < ws_end; ws += ws_inc) for (ws = 0; ws < ws_end; ws += ws_inc)
for (addr = start + 0x400; addr < end; addr += 0x400 * 2) for (addr = start + 0x400; addr < end; addr += 0x400 * 2)
cache32_unroll32(addr|ws,Index_Invalidate_I); cache32_unroll32(addr|ws,Index_Invalidate_I);
CACHE32_UNROLL32_ALIGN; CACHE32_UNROLL32_ALIGN;
/* I'm in odd chunk. blast even chunks */ /* I'm in odd chunk. blast even chunks */
for (ws = 0; ws < ws_end; ws += ws_inc) for (ws = 0; ws < ws_end; ws += ws_inc)
for (addr = start; addr < end; addr += 0x400 * 2) for (addr = start; addr < end; addr += 0x400 * 2)
cache32_unroll32(addr|ws,Index_Invalidate_I); cache32_unroll32(addr|ws,Index_Invalidate_I);
} }
@ -156,13 +156,13 @@ static inline void tx49_blast_icache32_page_indexed(unsigned long page)
CACHE32_UNROLL32_ALIGN2; CACHE32_UNROLL32_ALIGN2;
/* I'm in even chunk. blast odd chunks */ /* I'm in even chunk. blast odd chunks */
for (ws = 0; ws < ws_end; ws += ws_inc) for (ws = 0; ws < ws_end; ws += ws_inc)
for (addr = start + 0x400; addr < end; addr += 0x400 * 2) for (addr = start + 0x400; addr < end; addr += 0x400 * 2)
cache32_unroll32(addr|ws,Index_Invalidate_I); cache32_unroll32(addr|ws,Index_Invalidate_I);
CACHE32_UNROLL32_ALIGN; CACHE32_UNROLL32_ALIGN;
/* I'm in odd chunk. blast even chunks */ /* I'm in odd chunk. blast even chunks */
for (ws = 0; ws < ws_end; ws += ws_inc) for (ws = 0; ws < ws_end; ws += ws_inc)
for (addr = start; addr < end; addr += 0x400 * 2) for (addr = start; addr < end; addr += 0x400 * 2)
cache32_unroll32(addr|ws,Index_Invalidate_I); cache32_unroll32(addr|ws,Index_Invalidate_I);
} }

View file

@ -270,7 +270,7 @@ static void local_sb1_flush_icache_range(unsigned long start,
__sb1_writeback_inv_dcache_all(); __sb1_writeback_inv_dcache_all();
else else
__sb1_writeback_inv_dcache_range(start, end); __sb1_writeback_inv_dcache_range(start, end);
/* Just flush the whole icache if the range is big enough */ /* Just flush the whole icache if the range is big enough */
if ((end - start) > icache_range_cutoff) if ((end - start) > icache_range_cutoff)
__sb1_flush_icache_all(); __sb1_flush_icache_all();

View file

@ -25,7 +25,7 @@
#include <asm/sibyte/sb1250_regs.h> #include <asm/sibyte/sb1250_regs.h>
#include <asm/sibyte/sb1250_scd.h> #include <asm/sibyte/sb1250_scd.h>
#endif #endif
/* SB1 definitions */ /* SB1 definitions */
/* XXX should come from config1 XXX */ /* XXX should come from config1 XXX */
@ -136,14 +136,14 @@ static inline void breakout_cerrd(unsigned int val)
#ifndef CONFIG_SIBYTE_BUS_WATCHER #ifndef CONFIG_SIBYTE_BUS_WATCHER
static void check_bus_watcher(void) static void check_bus_watcher(void)
{ {
uint32_t status, l2_err, memio_err; uint32_t status, l2_err, memio_err;
/* Destructive read, clears register and interrupt */ /* Destructive read, clears register and interrupt */
status = csr_in32(IOADDR(A_SCD_BUS_ERR_STATUS)); status = csr_in32(IOADDR(A_SCD_BUS_ERR_STATUS));
/* Bit 31 is always on, but there's no #define for that */ /* Bit 31 is always on, but there's no #define for that */
if (status & ~(1UL << 31)) { if (status & ~(1UL << 31)) {
l2_err = csr_in32(IOADDR(A_BUS_L2_ERRORS)); l2_err = csr_in32(IOADDR(A_BUS_L2_ERRORS));
memio_err = csr_in32(IOADDR(A_BUS_MEM_IO_ERRORS)); memio_err = csr_in32(IOADDR(A_BUS_MEM_IO_ERRORS));
prom_printf("Bus watcher error counters: %08x %08x\n", l2_err, memio_err); prom_printf("Bus watcher error counters: %08x %08x\n", l2_err, memio_err);
@ -153,14 +153,14 @@ static void check_bus_watcher(void)
(int)(G_SCD_BERR_TID(status) >> 6), (int)(G_SCD_BERR_TID(status) >> 6),
(int)G_SCD_BERR_RID(status), (int)G_SCD_BERR_RID(status),
(int)G_SCD_BERR_DCODE(status)); (int)G_SCD_BERR_DCODE(status));
} else { } else {
prom_printf("Bus watcher indicates no error\n"); prom_printf("Bus watcher indicates no error\n");
} }
} }
#else #else
extern void check_bus_watcher(void); extern void check_bus_watcher(void);
#endif #endif
asmlinkage void sb1_cache_error(void) asmlinkage void sb1_cache_error(void)
{ {
uint64_t cerr_dpa; uint64_t cerr_dpa;

View file

@ -162,7 +162,7 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
for (i = 0; i < nents; i++, sg++) { for (i = 0; i < nents; i++, sg++) {
unsigned long addr; unsigned long addr;
addr = (unsigned long) page_address(sg->page); addr = (unsigned long) page_address(sg->page);
if (addr) if (addr)
__dma_sync(addr + sg->offset, sg->length, direction); __dma_sync(addr + sg->offset, sg->length, direction);
@ -230,9 +230,9 @@ void dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,
size_t size, enum dma_data_direction direction) size_t size, enum dma_data_direction direction)
{ {
unsigned long addr; unsigned long addr;
BUG_ON(direction == DMA_NONE); BUG_ON(direction == DMA_NONE);
addr = dma_handle + PAGE_OFFSET; addr = dma_handle + PAGE_OFFSET;
__dma_sync(addr, size, direction); __dma_sync(addr, size, direction);
} }
@ -282,9 +282,9 @@ void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
enum dma_data_direction direction) enum dma_data_direction direction)
{ {
int i; int i;
BUG_ON(direction == DMA_NONE); BUG_ON(direction == DMA_NONE);
/* Make sure that gcc doesn't leave the empty loop body. */ /* Make sure that gcc doesn't leave the empty loop body. */
for (i = 0; i < nelems; i++, sg++) for (i = 0; i < nelems; i++, sg++)
__dma_sync((unsigned long)page_address(sg->page), __dma_sync((unsigned long)page_address(sg->page),

View file

@ -198,7 +198,7 @@ static inline void copy_page_cpu(void *to, void *from)
/* /*
* Pad descriptors to cacheline, since each is exclusively owned by a * Pad descriptors to cacheline, since each is exclusively owned by a
* particular CPU. * particular CPU.
*/ */
typedef struct dmadscr_s { typedef struct dmadscr_s {
u64 dscr_a; u64 dscr_a;

View file

@ -27,11 +27,11 @@
SAVE_ALL SAVE_ALL
CLI CLI
.set at .set at
mfc0 t0, CP0_CAUSE mfc0 t0, CP0_CAUSE
mfc0 t2, CP0_STATUS mfc0 t2, CP0_STATUS
and t0, t2 and t0, t2
andi t1, t0, STATUSF_IP0 /* sw0 software interrupt */ andi t1, t0, STATUSF_IP0 /* sw0 software interrupt */
bnez t1, ll_sw0_irq bnez t1, ll_sw0_irq
andi t1, t0, STATUSF_IP1 /* sw1 software interrupt */ andi t1, t0, STATUSF_IP1 /* sw1 software interrupt */
@ -103,25 +103,25 @@ ll_pcia_irq:
move a1, sp move a1, sp
jal do_IRQ jal do_IRQ
j ret_from_irq j ret_from_irq
ll_pcib_irq: ll_pcib_irq:
li a0, 5 li a0, 5
move a1, sp move a1, sp
jal do_IRQ jal do_IRQ
j ret_from_irq j ret_from_irq
ll_uart_irq: ll_uart_irq:
li a0, 6 li a0, 6
move a1, sp move a1, sp
jal do_IRQ jal do_IRQ
j ret_from_irq j ret_from_irq
ll_cputimer_irq: ll_cputimer_irq:
li a0, 7 li a0, 7
move a1, sp move a1, sp
jal ll_timer_interrupt jal ll_timer_interrupt
j ret_from_irq j ret_from_irq
ll_mv64340_decode_irq: ll_mv64340_decode_irq:
move a0, sp move a0, sp
jal ll_mv64340_irq jal ll_mv64340_irq

View file

@ -64,7 +64,7 @@ static u8 exchange_bit(u8 val, u8 cs)
/* turn the clock off and read-strobe */ /* turn the clock off and read-strobe */
JAGUAR_FPGA_WRITE((val << 2) | cs | 0x10, EEPROM_MODE); JAGUAR_FPGA_WRITE((val << 2) | cs | 0x10, EEPROM_MODE);
/* return the data */ /* return the data */
return ((JAGUAR_FPGA_READ(EEPROM_MODE) >> 3) & 0x1); return ((JAGUAR_FPGA_READ(EEPROM_MODE) >> 3) & 0x1);
} }

View file

@ -451,7 +451,7 @@ static int __init momenco_jaguar_atx_setup(void)
#ifdef GEMDEBUG_TRACEBUFFER #ifdef GEMDEBUG_TRACEBUFFER
{ {
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 */

View file

@ -27,11 +27,11 @@
SAVE_ALL SAVE_ALL
CLI CLI
.set at .set at
mfc0 t0, CP0_CAUSE mfc0 t0, CP0_CAUSE
mfc0 t2, CP0_STATUS mfc0 t2, CP0_STATUS
and t0, t2 and t0, t2
andi t1, t0, STATUSF_IP0 /* sw0 software interrupt */ andi t1, t0, STATUSF_IP0 /* sw0 software interrupt */
bnez t1, ll_sw0_irq bnez t1, ll_sw0_irq
andi t1, t0, STATUSF_IP1 /* sw1 software interrupt */ andi t1, t0, STATUSF_IP1 /* sw1 software interrupt */
@ -83,7 +83,7 @@ ll_pmc_irq:
move a1, sp move a1, sp
jal do_IRQ jal do_IRQ
j ret_from_irq j ret_from_irq
ll_cpci_decode_irq: ll_cpci_decode_irq:
move a0, sp move a0, sp
jal ll_cpci_irq jal ll_cpci_irq
@ -99,4 +99,4 @@ ll_cputimer_irq:
move a1, sp move a1, sp
jal do_IRQ jal do_IRQ
j ret_from_irq j ret_from_irq

View file

@ -67,7 +67,7 @@ static u8 exchange_bit(u8 val, u8 cs)
/* turn the clock off and read-strobe */ /* turn the clock off and read-strobe */
OCELOT_FPGA_WRITE((val << 2) | cs | 0x10, EEPROM_MODE); OCELOT_FPGA_WRITE((val << 2) | cs | 0x10, EEPROM_MODE);
/* return the data */ /* return the data */
return ((OCELOT_FPGA_READ(EEPROM_MODE) >> 3) & 0x1); return ((OCELOT_FPGA_READ(EEPROM_MODE) >> 3) & 0x1);
} }

View file

@ -5,7 +5,7 @@ static void ddb5074_fixup(struct pci_dev *dev)
{ {
extern struct pci_dev *pci_pmu; extern struct pci_dev *pci_pmu;
u8 t8; u8 t8;
pci_pmu = dev; /* for LEDs D2 and D3 */ pci_pmu = dev; /* for LEDs D2 and D3 */
/* Program the lines for LEDs D2 and D3 to output */ /* Program the lines for LEDs D2 and D3 to output */
pci_read_config_byte(dev, 0x7d, &t8); pci_read_config_byte(dev, 0x7d, &t8);

View file

@ -65,7 +65,7 @@ static void ddb5477_amd_lance_fixup(struct pci_dev *dev)
ioaddr = pci_resource_start(dev, 0); ioaddr = pci_resource_start(dev, 0);
inw(ioaddr + PCNET32_WIO_RESET); /* reset chip */ inw(ioaddr + PCNET32_WIO_RESET); /* reset chip */
/* bcr_18 |= 0x0800 */ /* bcr_18 |= 0x0800 */
outw(18, ioaddr + PCNET32_WIO_RAP); outw(18, ioaddr + PCNET32_WIO_RAP);
temp = inw(ioaddr + PCNET32_WIO_BDP); temp = inw(ioaddr + PCNET32_WIO_BDP);

View file

@ -56,7 +56,7 @@ static void __init malta_piix_func0_fixup(struct pci_dev *pdev)
0, 0, 0, 3, 0, 0, 0, 3,
4, 5, 6, 7, 4, 5, 6, 7,
0, 9, 10, 11, 0, 9, 10, 11,
12, 0, 14, 15 12, 0, 14, 15
}; };
int i; int i;

View file

@ -7,7 +7,7 @@
* Author: MontaVista Software, Inc. * Author: MontaVista Software, Inc.
* ppopov@mvista.com or source@mvista.com * ppopov@mvista.com or source@mvista.com
* *
* Copyright (C) 2000-2001 Toshiba Corporation * Copyright (C) 2000-2001 Toshiba Corporation
* *
* Copyright (C) 2004 MontaVista Software Inc. * Copyright (C) 2004 MontaVista Software Inc.
* Author: Manish Lachwani (mlachwani@mvista.com) * Author: Manish Lachwani (mlachwani@mvista.com)

View file

@ -32,7 +32,7 @@
* Device 4: Unused * Device 4: Unused
* Device 5: Slot 2 * Device 5: Slot 2
* Device 6: Slot 3 * Device 6: Slot 3
* Device 7: Slot 4 * Device 7: Slot 4
* *
* Documentation says the VGA is device 5 and device 3 is unused but that * Documentation says the VGA is device 5 and device 3 is unused but that
* seem to be a documentation error. At least on my RM200C the Cirrus * seem to be a documentation error. At least on my RM200C the Cirrus

View file

@ -127,7 +127,7 @@ static inline void ddb_close_config_base(struct pci_config_swap *swap)
} }
static int read_config_dword(struct pci_config_swap *swap, static int read_config_dword(struct pci_config_swap *swap,
struct pci_bus *bus, u32 devfn, u32 where, struct pci_bus *bus, u32 devfn, u32 where,
u32 * val) u32 * val)
{ {
u32 bus_num, slot_num, func_num; u32 bus_num, slot_num, func_num;
@ -153,7 +153,7 @@ static int read_config_dword(struct pci_config_swap *swap,
} }
static int read_config_word(struct pci_config_swap *swap, static int read_config_word(struct pci_config_swap *swap,
struct pci_bus *bus, u32 devfn, u32 where, struct pci_bus *bus, u32 devfn, u32 where,
u16 * val) u16 * val)
{ {
int status; int status;

View file

@ -1,16 +1,16 @@
/* /*
* Copyright 2001 MontaVista Software Inc. * Copyright 2001 MontaVista Software Inc.
* Author: MontaVista Software, Inc. * Author: MontaVista Software, Inc.
* ahennessy@mvista.com * ahennessy@mvista.com
* *
* Copyright (C) 2000-2001 Toshiba Corporation * Copyright (C) 2000-2001 Toshiba Corporation
* Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org) * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org)
* *
* Based on arch/mips/ddb5xxx/ddb5477/pci_ops.c * Based on arch/mips/ddb5xxx/ddb5477/pci_ops.c
* *
* Define the pci_ops for the Toshiba rbtx4927 * Define the pci_ops for the Toshiba rbtx4927
* *
* Much of the code is derived from the original DDB5074 port by * Much of the code is derived from the original DDB5074 port by
* Geert Uytterhoeven <geert@sonycom.com> * Geert Uytterhoeven <geert@sonycom.com>
* *
* Copyright 2004 MontaVista Software Inc. * Copyright 2004 MontaVista Software Inc.

View file

@ -76,7 +76,7 @@ struct pci_controller ddb5477_io_controller = {
*/ */
/* /*
* irq mapping : device -> pci int # -> vrc4377 irq# , * irq mapping : device -> pci int # -> vrc4377 irq# ,
* ddb5477 board manual page 4 and vrc5477 manual page 46 * ddb5477 board manual page 4 and vrc5477 manual page 46
*/ */
@ -137,9 +137,9 @@ int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
unsigned char *slot_irq_map; unsigned char *slot_irq_map;
unsigned char irq; unsigned char irq;
/* /*
* We ignore the swizzled slot and pin values. The original * We ignore the swizzled slot and pin values. The original
* pci_fixup_irq() codes largely base irq number on the dev slot * pci_fixup_irq() codes largely base irq number on the dev slot
* numbers because except for one case they are unique even * numbers because except for one case they are unique even
* though there are multiple pci buses. * though there are multiple pci buses.
*/ */
@ -160,7 +160,7 @@ int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
if (mips_machtype == MACH_NEC_ROCKHOPPERII) { if (mips_machtype == MACH_NEC_ROCKHOPPERII) {
/* hack to distinquish overlapping slot 20s, one /* hack to distinquish overlapping slot 20s, one
* on bus 0 (ALI USB on the M1535 on the backplane), * on bus 0 (ALI USB on the M1535 on the backplane),
* and one on bus 2 (NEC USB controller on the CPU board) * and one on bus 2 (NEC USB controller on the CPU board)
* Make the M1535 USB - ISA IRQ number 9. * Make the M1535 USB - ISA IRQ number 9.
*/ */

View file

@ -132,7 +132,7 @@ static int __init pcibios_init(void)
hose->need_domain_info = need_domain_info; hose->need_domain_info = need_domain_info;
next_busno = bus->subordinate + 1; next_busno = bus->subordinate + 1;
/* Don't allow 8-bit bus number overflow inside the hose - /* Don't allow 8-bit bus number overflow inside the hose -
reserve some space for bridges. */ reserve some space for bridges. */
if (next_busno > 224) { if (next_busno > 224) {
next_busno = 0; next_busno = 0;
need_domain_info = 1; need_domain_info = 1;
@ -260,7 +260,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)
(dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) { (dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {
pci_read_bridge_bases(bus); pci_read_bridge_bases(bus);
pcibios_fixup_device_resources(dev, bus); pcibios_fixup_device_resources(dev, bus);
} }
for (ln = bus->devices.next; ln != &bus->devices; ln = ln->next) { for (ln = bus->devices.next; ln != &bus->devices; ln = ln->next) {
struct pci_dev *dev = pci_dev_b(ln); struct pci_dev *dev = pci_dev_b(ln);

View file

@ -30,7 +30,7 @@
* *
* This code reads the ATMEL 24CXX EEPROM. The PMC-Sierra Yosemite board uses the ATMEL * This code reads the ATMEL 24CXX EEPROM. The PMC-Sierra Yosemite board uses the ATMEL
* 24C32/24C64 which uses two byte addressing as compared to 24C16. Note that this program * 24C32/24C64 which uses two byte addressing as compared to 24C16. Note that this program
* uses the serial port like /dev/ttyS0, to communicate with the EEPROM. Hence, you are * uses the serial port like /dev/ttyS0, to communicate with the EEPROM. Hence, you are
* expected to have a connectivity from the EEPROM to the serial port. This program does * expected to have a connectivity from the EEPROM to the serial port. This program does
* __not__ communicate using the I2C protocol * __not__ communicate using the I2C protocol
*/ */
@ -64,14 +64,14 @@ static void send_ack(void)
static void send_byte(unsigned char byte) static void send_byte(unsigned char byte)
{ {
int i = 0; int i = 0;
for (i = 7; i >= 0; i--) for (i = 7; i >= 0; i--)
send_bit((byte >> i) & 0x01); send_bit((byte >> i) & 0x01);
} }
static void send_start(void) static void send_start(void)
{ {
sda_hi; sda_hi;
delay(TXX); delay(TXX);
scl_hi; scl_hi;
delay(TXX); delay(TXX);
@ -114,9 +114,9 @@ static unsigned char recv_byte(void) {
int i; int i;
unsigned char byte=0; unsigned char byte=0;
for (i=7;i>=0;i--) for (i=7;i>=0;i--)
byte |= (recv_bit() << i); byte |= (recv_bit() << i);
return byte; return byte;
} }

View file

@ -27,7 +27,7 @@
*/ */
/* /*
* Header file for atmel_read_eeprom.c * Header file for atmel_read_eeprom.c
*/ */
#include <linux/types.h> #include <linux/types.h>
@ -46,7 +46,7 @@
#define DEFAULT_PORT "/dev/ttyS0" /* Port to open */ #define DEFAULT_PORT "/dev/ttyS0" /* Port to open */
#define TXX 0 /* Dummy loop for spinning */ #define TXX 0 /* Dummy loop for spinning */
#define BLOCK_SEL 0x00 #define BLOCK_SEL 0x00
#define SLAVE_ADDR 0xa0 #define SLAVE_ADDR 0xa0
#define READ_BIT 0x01 #define READ_BIT 0x01
#define WRITE_BIT 0x00 #define WRITE_BIT 0x00

View file

@ -242,7 +242,7 @@ int __init ip22_eisa_init(void)
int i, c; int i, c;
char *str; char *str;
u8 *slot_addr; u8 *slot_addr;
if (!(sgimc->systemid & SGIMC_SYSID_EPRESENT)) { if (!(sgimc->systemid & SGIMC_SYSID_EPRESENT)) {
printk(KERN_INFO "EISA: bus not present.\n"); printk(KERN_INFO "EISA: bus not present.\n");
return 1; return 1;

View file

@ -49,7 +49,7 @@ void __init sgihpc_init(void)
sgint = &sgioc->int3; sgint = &sgioc->int3;
system_type = "SGI Indy"; system_type = "SGI Indy";
} }
sgi_ioc_reset = (SGIOC_RESET_PPORT | SGIOC_RESET_KBDMOUSE | sgi_ioc_reset = (SGIOC_RESET_PPORT | SGIOC_RESET_KBDMOUSE |
SGIOC_RESET_EISA | SGIOC_RESET_ISDN | SGIOC_RESET_EISA | SGIOC_RESET_ISDN |
SGIOC_RESET_LC0OFF); SGIOC_RESET_LC0OFF);

View file

@ -28,7 +28,7 @@
/* #define DEBUG_SGINT */ /* #define DEBUG_SGINT */
/* So far nothing hangs here */ /* So far nothing hangs here */
#undef USE_LIO3_IRQ #undef USE_LIO3_IRQ
struct sgint_regs *sgint; struct sgint_regs *sgint;
@ -272,32 +272,32 @@ void indy_buserror_irq(struct pt_regs *regs)
irq_exit(); irq_exit();
} }
static struct irqaction local0_cascade = { static struct irqaction local0_cascade = {
.handler = no_action, .handler = no_action,
.flags = SA_INTERRUPT, .flags = SA_INTERRUPT,
.name = "local0 cascade", .name = "local0 cascade",
}; };
static struct irqaction local1_cascade = { static struct irqaction local1_cascade = {
.handler = no_action, .handler = no_action,
.flags = SA_INTERRUPT, .flags = SA_INTERRUPT,
.name = "local1 cascade", .name = "local1 cascade",
}; };
static struct irqaction buserr = { static struct irqaction buserr = {
.handler = no_action, .handler = no_action,
.flags = SA_INTERRUPT, .flags = SA_INTERRUPT,
.name = "Bus Error", .name = "Bus Error",
}; };
static struct irqaction map0_cascade = { static struct irqaction map0_cascade = {
.handler = no_action, .handler = no_action,
.flags = SA_INTERRUPT, .flags = SA_INTERRUPT,
.name = "mapable0 cascade", .name = "mapable0 cascade",
}; };
#ifdef USE_LIO3_IRQ #ifdef USE_LIO3_IRQ
static struct irqaction map1_cascade = { static struct irqaction map1_cascade = {
.handler = no_action, .handler = no_action,
.flags = SA_INTERRUPT, .flags = SA_INTERRUPT,
.name = "mapable1 cascade", .name = "mapable1 cascade",

View file

@ -39,7 +39,7 @@
*ptr |= EEPROM_CSEL; \ *ptr |= EEPROM_CSEL; \
*ptr |= EEPROM_ECLK; }) *ptr |= EEPROM_ECLK; })
#define eeprom_cs_off(ptr) ({ \ #define eeprom_cs_off(ptr) ({ \
*ptr &= ~EEPROM_ECLK; \ *ptr &= ~EEPROM_ECLK; \
*ptr &= ~EEPROM_CSEL; \ *ptr &= ~EEPROM_CSEL; \
@ -50,7 +50,7 @@
/* /*
* clock in the nvram command and the register number. For the * clock in the nvram command and the register number. For the
* national semiconductor nv ram chip the op code is 3 bits and * national semiconductor nv ram chip the op code is 3 bits and
* the address is 6/8 bits. * the address is 6/8 bits.
*/ */
static inline void eeprom_cmd(volatile unsigned int *ctrl, unsigned cmd, static inline void eeprom_cmd(volatile unsigned int *ctrl, unsigned cmd,
unsigned reg) unsigned reg)
@ -90,7 +90,7 @@ unsigned short ip22_eeprom_read(volatile unsigned int *ctrl, int reg)
if (*ctrl & EEPROM_DATI) if (*ctrl & EEPROM_DATI)
res |= 1; res |= 1;
} }
eeprom_cs_off(ctrl); eeprom_cs_off(ctrl);
return res; return res;
@ -113,7 +113,7 @@ unsigned short ip22_nvram_read(int reg)
reg <<= 1; reg <<= 1;
tmp = hpc3c0->bbram[reg++] & 0xff; tmp = hpc3c0->bbram[reg++] & 0xff;
return (tmp << 8) | (hpc3c0->bbram[reg] & 0xff); return (tmp << 8) | (hpc3c0->bbram[reg] & 0xff);
} }
} }
EXPORT_SYMBOL(ip22_nvram_read); EXPORT_SYMBOL(ip22_nvram_read);

View file

@ -185,7 +185,7 @@ static irqreturn_t panel_int(int irq, void *dev_id, struct pt_regs *regs)
add_timer(&debounce_timer); add_timer(&debounce_timer);
} }
/* Power button was pressed /* Power button was pressed
* ioc.ps page 22: "The Panel Register is called Power Control by Full * ioc.ps page 22: "The Panel Register is called Power Control by Full
* House. Only lowest 2 bits are used. Guiness uses upper four bits * House. Only lowest 2 bits are used. Guiness uses upper four bits
* for volume control". This is not true, all bits are pulled high * for volume control". This is not true, all bits are pulled high

View file

@ -126,7 +126,7 @@ static __init void indy_time_init(void)
unsigned long r4k_ticks[3]; unsigned long r4k_ticks[3];
unsigned long r4k_tick; unsigned long r4k_tick;
/* /*
* Figure out the r4k offset, the algorithm is very simple and works in * Figure out the r4k offset, the algorithm is very simple and works in
* _all_ cases as long as the 8254 counter register itself works ok (as * _all_ cases as long as the 8254 counter register itself works ok (as
* an interrupt driving timer it does not because of bug, this is why * an interrupt driving timer it does not because of bug, this is why

View file

@ -538,7 +538,7 @@ void __init mem_init(void)
for_each_online_node(node) { for_each_online_node(node) {
unsigned slot, numslots; unsigned slot, numslots;
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.
*/ */

View file

@ -140,7 +140,7 @@ static irqreturn_t ip32_rtc_int(int irq, void *dev_id, struct pt_regs *regs)
reg_c = CMOS_READ(RTC_INTR_FLAGS); reg_c = CMOS_READ(RTC_INTR_FLAGS);
if (!(reg_c & RTC_IRQF)) { if (!(reg_c & RTC_IRQF)) {
printk(KERN_WARNING printk(KERN_WARNING
"%s: RTC IRQ without RTC_IRQF\n", __FUNCTION__); "%s: RTC IRQ without RTC_IRQF\n", __FUNCTION__);
} }
/* Wait until interrupt goes away */ /* Wait until interrupt goes away */

View file

@ -17,15 +17,15 @@
*/ */
/* ********************************************************************* /* *********************************************************************
* *
* Broadcom Common Firmware Environment (CFE) * Broadcom Common Firmware Environment (CFE)
* *
* Error codes File: cfe_error.h * Error codes File: cfe_error.h
* *
* CFE's global error code list is here. * CFE's global error code list is here.
* *
* Author: Mitch Lichtenberg * Author: Mitch Lichtenberg
* *
********************************************************************* */ ********************************************************************* */

View file

@ -38,7 +38,7 @@ static void cfe_console_write(struct console *cons, const char *str,
last += written; last += written;
} while (last < count); } while (last < count);
} }
} }
static int cfe_console_setup(struct console *cons, char *str) static int cfe_console_setup(struct console *cons, char *str)

View file

@ -285,7 +285,7 @@ void __init prom_init(void)
while (1) ; while (1) ;
} }
cfe_init(cfe_handle, cfe_ept); cfe_init(cfe_handle, cfe_ept);
/* /*
* Get the handle for (at least) prom_putchar, possibly for * Get the handle for (at least) prom_putchar, possibly for
* boot console * boot console
*/ */

View file

@ -57,7 +57,7 @@ void __init prom_prepare_cpus(unsigned int max_cpus)
void prom_boot_secondary(int cpu, struct task_struct *idle) void prom_boot_secondary(int cpu, struct task_struct *idle)
{ {
int retval; int retval;
retval = cfe_cpu_start(cpu_logical_map(cpu), &smp_bootstrap, retval = cfe_cpu_start(cpu_logical_map(cpu), &smp_bootstrap,
__KSTK_TOS(idle), __KSTK_TOS(idle),
(unsigned long)idle->thread_info, 0); (unsigned long)idle->thread_info, 0);

View file

@ -10,13 +10,13 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/* /*
* The Bus Watcher monitors internal bus transactions and maintains * The Bus Watcher monitors internal bus transactions and maintains
* counts of transactions with error status, logging details and * counts of transactions with error status, logging details and
* causing one of several interrupts. This driver provides a handler * causing one of several interrupts. This driver provides a handler
@ -155,7 +155,7 @@ static int bw_read_proc(char *page, char **start, off_t off,
static void create_proc_decoder(struct bw_stats_struct *stats) static void create_proc_decoder(struct bw_stats_struct *stats)
{ {
struct proc_dir_entry *ent; struct proc_dir_entry *ent;
ent = create_proc_read_entry("bus_watcher", S_IWUSR | S_IRUGO, NULL, ent = create_proc_read_entry("bus_watcher", S_IWUSR | S_IRUGO, NULL,
bw_read_proc, stats); bw_read_proc, stats);
if (!ent) { if (!ent) {

View file

@ -377,7 +377,7 @@ void __init arch_init_irq(void)
/* /*
* Note that the timer interrupts are also mapped, but this is * Note that the timer interrupts are also mapped, but this is
* done in sb1250_time_init(). Also, the profiling driver * done in sb1250_time_init(). Also, the profiling driver
* does its own management of IP7. * does its own management of IP7.
*/ */
@ -392,7 +392,7 @@ void __init arch_init_irq(void)
if (kgdb_flag) { if (kgdb_flag) {
kgdb_irq = K_INT_UART_0 + kgdb_port; kgdb_irq = K_INT_UART_0 + kgdb_port;
#ifdef CONFIG_SIBYTE_SB1250_DUART #ifdef CONFIG_SIBYTE_SB1250_DUART
sb1250_duart_present[kgdb_port] = 0; sb1250_duart_present[kgdb_port] = 0;
#endif #endif
/* Setup uart 1 settings, mapper */ /* Setup uart 1 settings, mapper */

View file

@ -128,7 +128,7 @@ static int m41t81_write(uint8_t addr, int b)
/* Clear error bit by writing a 1 */ /* Clear error bit by writing a 1 */
bus_writeq(M_SMB_ERROR, SMB_CSR(R_SMB_STATUS)); bus_writeq(M_SMB_ERROR, SMB_CSR(R_SMB_STATUS));
return -1; return -1;
} }
/* read the same byte again to make sure it is written */ /* read the same byte again to make sure it is written */
bus_writeq(V_SMB_ADDR(M41T81_CCR_ADDRESS) | V_SMB_TT_RD1BYTE, bus_writeq(V_SMB_ADDR(M41T81_CCR_ADDRESS) | V_SMB_TT_RD1BYTE,
@ -136,7 +136,7 @@ static int m41t81_write(uint8_t addr, int b)
while (bus_readq(SMB_CSR(R_SMB_STATUS)) & M_SMB_BUSY) while (bus_readq(SMB_CSR(R_SMB_STATUS)) & M_SMB_BUSY)
; ;
return 0; return 0;
} }
@ -148,13 +148,13 @@ int m41t81_set_time(unsigned long t)
/* /*
* Note the write order matters as it ensures the correctness. * Note the write order matters as it ensures the correctness.
* When we write sec, 10th sec is clear. It is reasonable to * When we write sec, 10th sec is clear. It is reasonable to
* believe we should finish writing min within a second. * believe we should finish writing min within a second.
*/ */
tm.tm_sec = BIN2BCD(tm.tm_sec); tm.tm_sec = BIN2BCD(tm.tm_sec);
m41t81_write(M41T81REG_SC, tm.tm_sec); m41t81_write(M41T81REG_SC, tm.tm_sec);
tm.tm_min = BIN2BCD(tm.tm_min); tm.tm_min = BIN2BCD(tm.tm_min);
m41t81_write(M41T81REG_MN, tm.tm_min); m41t81_write(M41T81REG_MN, tm.tm_min);
@ -187,7 +187,7 @@ unsigned long m41t81_get_time(void)
{ {
unsigned int year, mon, day, hour, min, sec; unsigned int year, mon, day, hour, min, sec;
/* /*
* min is valid if two reads of sec are the same. * min is valid if two reads of sec are the same.
*/ */
for (;;) { for (;;) {

View file

@ -98,7 +98,7 @@ static int __init swarm_setup(void)
rtc_get_time = xicor_get_time; rtc_get_time = xicor_get_time;
rtc_set_time = xicor_set_time; rtc_set_time = xicor_set_time;
} }
if (m41t81_probe()) { if (m41t81_probe()) {
printk("swarm setup: M41T81 RTC detected.\n"); printk("swarm setup: M41T81 RTC detected.\n");
rtc_get_time = m41t81_get_time; rtc_get_time = m41t81_get_time;

View file

@ -103,7 +103,7 @@ static unsigned int ls1bit8(unsigned int x)
/* /*
* hwint 1 deals with EISA and SCSI interrupts, * hwint 1 deals with EISA and SCSI interrupts,
* *
* The EISA_INT bit in CSITPEND is high active, all others are low active. * The EISA_INT bit in CSITPEND is high active, all others are low active.
*/ */
void pciasic_hwint1(struct pt_regs *regs) void pciasic_hwint1(struct pt_regs *regs)

View file

@ -111,7 +111,7 @@ static struct resource sni_mem_resource = {
* The RM200/RM300 has a few holes in it's PCI/EISA memory address space used * The RM200/RM300 has a few holes in it's PCI/EISA memory address space used
* for other purposes. Be paranoid and allocate all of the before the PCI * for other purposes. Be paranoid and allocate all of the before the PCI
* code gets a chance to to map anything else there ... * code gets a chance to to map anything else there ...
* *
* This leaves the following areas available: * This leaves the following areas available:
* *
* 0x10000000 - 0x1009ffff (640kB) PCI/EISA/ISA Bus Memory * 0x10000000 - 0x1009ffff (640kB) PCI/EISA/ISA Bus Memory

View file

@ -42,13 +42,13 @@
CLI CLI
.set at .set at
mfc0 t0, CP0_CAUSE mfc0 t0, CP0_CAUSE
mfc0 t1, CP0_STATUS mfc0 t1, CP0_STATUS
and t0, t1 and t0, t1
andi t1, t0, STATUSF_IP7 /* cpu timer */ andi t1, t0, STATUSF_IP7 /* cpu timer */
bnez t1, ll_ip7 bnez t1, ll_ip7
/* IP6..IP3 multiplexed -- do not use */ /* IP6..IP3 multiplexed -- do not use */
andi t1, t0, STATUSF_IP2 /* tx4927 pic */ andi t1, t0, STATUSF_IP2 /* tx4927 pic */

View file

@ -152,7 +152,7 @@ dump_cp0(char *key)
print_cp0(key, 16, "CONFIG ", read_c0_config()); print_cp0(key, 16, "CONFIG ", read_c0_config());
return; return;
} }
void print_pic(char *key, u32 reg, char *name) void print_pic(char *key, u32 reg, char *name)
{ {
printk("%s pic:0x%08x:%s=0x%08x\n", key, reg, name, printk("%s pic:0x%08x:%s=0x%08x\n", key, reg, name,

View file

@ -1,5 +1,5 @@
obj-y += toshiba_rbtx4927_prom.o obj-y += toshiba_rbtx4927_prom.o
obj-y += toshiba_rbtx4927_setup.o obj-y += toshiba_rbtx4927_setup.o
obj-y += toshiba_rbtx4927_irq.o obj-y += toshiba_rbtx4927_irq.o
EXTRA_AFLAGS := $(CFLAGS) EXTRA_AFLAGS := $(CFLAGS)

View file

@ -31,7 +31,7 @@
/* /*
IRQ Device IRQ Device
00 RBTX4927-ISA/00 00 RBTX4927-ISA/00
01 RBTX4927-ISA/01 PS2/Keyboard 01 RBTX4927-ISA/01 PS2/Keyboard
02 RBTX4927-ISA/02 Cascade RBTX4927-ISA (irqs 8-15) 02 RBTX4927-ISA/02 Cascade RBTX4927-ISA (irqs 8-15)
@ -52,15 +52,15 @@ IRQ Device
16 TX4927-CP0/00 Software 0 16 TX4927-CP0/00 Software 0
17 TX4927-CP0/01 Software 1 17 TX4927-CP0/01 Software 1
18 TX4927-CP0/02 Cascade TX4927-CP0 18 TX4927-CP0/02 Cascade TX4927-CP0
19 TX4927-CP0/03 Multiplexed -- do not use 19 TX4927-CP0/03 Multiplexed -- do not use
20 TX4927-CP0/04 Multiplexed -- do not use 20 TX4927-CP0/04 Multiplexed -- do not use
21 TX4927-CP0/05 Multiplexed -- do not use 21 TX4927-CP0/05 Multiplexed -- do not use
22 TX4927-CP0/06 Multiplexed -- do not use 22 TX4927-CP0/06 Multiplexed -- do not use
23 TX4927-CP0/07 CPU TIMER 23 TX4927-CP0/07 CPU TIMER
24 TX4927-PIC/00 24 TX4927-PIC/00
25 TX4927-PIC/01 25 TX4927-PIC/01
26 TX4927-PIC/02 26 TX4927-PIC/02
27 TX4927-PIC/03 Cascade RBTX4927-IOC 27 TX4927-PIC/03 Cascade RBTX4927-IOC
28 TX4927-PIC/04 28 TX4927-PIC/04
29 TX4927-PIC/05 RBTX4927 RTL-8019AS ethernet 29 TX4927-PIC/05 RBTX4927 RTL-8019AS ethernet
@ -80,7 +80,7 @@ IRQ Device
43 TX4927-PIC/19 43 TX4927-PIC/19
44 TX4927-PIC/20 44 TX4927-PIC/20
45 TX4927-PIC/21 45 TX4927-PIC/21
46 TX4927-PIC/22 TX4927 PCI PCI-ERR 46 TX4927-PIC/22 TX4927 PCI PCI-ERR
47 TX4927-PIC/23 TX4927 PCI PCI-PMA (not used) 47 TX4927-PIC/23 TX4927 PCI PCI-PMA (not used)
48 TX4927-PIC/24 48 TX4927-PIC/24
49 TX4927-PIC/25 49 TX4927-PIC/25
@ -100,7 +100,7 @@ IRQ Device
62 RBTX4927-IOC/06 62 RBTX4927-IOC/06
63 RBTX4927-IOC/07 63 RBTX4927-IOC/07
NOTES: NOTES:
SouthBridge/INTR is mapped to SouthBridge/A=PCI-B/#58 SouthBridge/INTR is mapped to SouthBridge/A=PCI-B/#58
SouthBridge/ISA/pin=0 no pci irq used by this device SouthBridge/ISA/pin=0 no pci irq used by this device
SouthBridge/IDE/pin=1 no pci irq used by this device, using INTR via ISA IRQ14 SouthBridge/IDE/pin=1 no pci irq used by this device, using INTR via ISA IRQ14
@ -175,19 +175,19 @@ JP7 is not bus master -- do NOT use -- only 4 pci bus master's allowed -- SouthB
static const u32 toshiba_rbtx4927_irq_debug_flag = static const u32 toshiba_rbtx4927_irq_debug_flag =
(TOSHIBA_RBTX4927_IRQ_NONE | TOSHIBA_RBTX4927_IRQ_INFO | (TOSHIBA_RBTX4927_IRQ_NONE | TOSHIBA_RBTX4927_IRQ_INFO |
TOSHIBA_RBTX4927_IRQ_WARN | TOSHIBA_RBTX4927_IRQ_EROR TOSHIBA_RBTX4927_IRQ_WARN | TOSHIBA_RBTX4927_IRQ_EROR
// | TOSHIBA_RBTX4927_IRQ_IOC_INIT // | TOSHIBA_RBTX4927_IRQ_IOC_INIT
// | TOSHIBA_RBTX4927_IRQ_IOC_STARTUP // | TOSHIBA_RBTX4927_IRQ_IOC_STARTUP
// | TOSHIBA_RBTX4927_IRQ_IOC_SHUTDOWN // | TOSHIBA_RBTX4927_IRQ_IOC_SHUTDOWN
// | TOSHIBA_RBTX4927_IRQ_IOC_ENABLE // | TOSHIBA_RBTX4927_IRQ_IOC_ENABLE
// | TOSHIBA_RBTX4927_IRQ_IOC_DISABLE // | TOSHIBA_RBTX4927_IRQ_IOC_DISABLE
// | TOSHIBA_RBTX4927_IRQ_IOC_MASK // | TOSHIBA_RBTX4927_IRQ_IOC_MASK
// | TOSHIBA_RBTX4927_IRQ_IOC_ENDIRQ // | TOSHIBA_RBTX4927_IRQ_IOC_ENDIRQ
// | TOSHIBA_RBTX4927_IRQ_ISA_INIT // | TOSHIBA_RBTX4927_IRQ_ISA_INIT
// | TOSHIBA_RBTX4927_IRQ_ISA_STARTUP // | TOSHIBA_RBTX4927_IRQ_ISA_STARTUP
// | TOSHIBA_RBTX4927_IRQ_ISA_SHUTDOWN // | TOSHIBA_RBTX4927_IRQ_ISA_SHUTDOWN
// | TOSHIBA_RBTX4927_IRQ_ISA_ENABLE // | TOSHIBA_RBTX4927_IRQ_ISA_ENABLE
// | TOSHIBA_RBTX4927_IRQ_ISA_DISABLE // | TOSHIBA_RBTX4927_IRQ_ISA_DISABLE
// | TOSHIBA_RBTX4927_IRQ_ISA_MASK // | TOSHIBA_RBTX4927_IRQ_ISA_MASK
// | TOSHIBA_RBTX4927_IRQ_ISA_ENDIRQ // | TOSHIBA_RBTX4927_IRQ_ISA_ENDIRQ
); );
#endif #endif

View file

@ -395,7 +395,7 @@ static int __init tx4927_pcibios_init(void)
/* enable secondary ide */ /* enable secondary ide */
v08_43 |= 0x80; v08_43 |= 0x80;
/* /*
* !!! DO NOT REMOVE THIS COMMENT IT IS REQUIRED BY SMSC !!! * !!! DO NOT REMOVE THIS COMMENT IT IS REQUIRED BY SMSC !!!
* *
* This line of code is intended to provide the user with a work * This line of code is intended to provide the user with a work

View file

@ -476,7 +476,7 @@ static inline int vrc4173_icu_init(int cascade_irq)
if (cascade_irq < GIU_IRQ(0) || cascade_irq > GIU_IRQ(15)) if (cascade_irq < GIU_IRQ(0) || cascade_irq > GIU_IRQ(15))
return -EINVAL; return -EINVAL;
vrc4173_outw(0, VRC4173_MSYSINT1REG); vrc4173_outw(0, VRC4173_MSYSINT1REG);
vr41xx_set_irq_trigger(GIU_IRQ_TO_PIN(cascade_irq), TRIGGER_LEVEL, SIGNAL_THROUGH); vr41xx_set_irq_trigger(GIU_IRQ_TO_PIN(cascade_irq), TRIGGER_LEVEL, SIGNAL_THROUGH);

View file

@ -7,10 +7,10 @@
*/ */
#ifndef _ASM_ASMMACRO_H #ifndef _ASM_ASMMACRO_H
#define _ASM_ASMMACRO_H #define _ASM_ASMMACRO_H
#include <linux/config.h> #include <linux/config.h>
#include <asm/hazards.h> #include <asm/hazards.h>
#ifdef CONFIG_32BIT #ifdef CONFIG_32BIT
#include <asm/asmmacro-32.h> #include <asm/asmmacro-32.h>
#endif #endif

View file

@ -20,13 +20,13 @@
#define SZLONG_MASK 31UL #define SZLONG_MASK 31UL
#define __LL "ll " #define __LL "ll "
#define __SC "sc " #define __SC "sc "
#define cpu_to_lelongp(x) cpu_to_le32p((__u32 *) (x)) #define cpu_to_lelongp(x) cpu_to_le32p((__u32 *) (x))
#elif (_MIPS_SZLONG == 64) #elif (_MIPS_SZLONG == 64)
#define SZLONG_LOG 6 #define SZLONG_LOG 6
#define SZLONG_MASK 63UL #define SZLONG_MASK 63UL
#define __LL "lld " #define __LL "lld "
#define __SC "scd " #define __SC "scd "
#define cpu_to_lelongp(x) cpu_to_le64p((__u64 *) (x)) #define cpu_to_lelongp(x) cpu_to_le64p((__u64 *) (x))
#endif #endif
#ifdef __KERNEL__ #ifdef __KERNEL__

View file

@ -247,7 +247,7 @@ extern void ll_vrc5477_irq_disable(int vrc5477_irq);
* All PCI irq but INTC are active low. * All PCI irq but INTC are active low.
*/ */
/* /*
* irq number block assignment * irq number block assignment
*/ */
@ -285,7 +285,7 @@ extern void ll_vrc5477_irq_disable(int vrc5477_irq);
#define VRC5477_IRQ_IOPCI_INTB (17 + VRC5477_IRQ_BASE) /* USB-P */ #define VRC5477_IRQ_IOPCI_INTB (17 + VRC5477_IRQ_BASE) /* USB-P */
#define VRC5477_IRQ_IOPCI_INTC (18 + VRC5477_IRQ_BASE) /* AC97 */ #define VRC5477_IRQ_IOPCI_INTC (18 + VRC5477_IRQ_BASE) /* AC97 */
#define VRC5477_IRQ_IOPCI_INTD (19 + VRC5477_IRQ_BASE) /* Reserved */ #define VRC5477_IRQ_IOPCI_INTD (19 + VRC5477_IRQ_BASE) /* Reserved */
#define VRC5477_IRQ_UART1 (20 + VRC5477_IRQ_BASE) #define VRC5477_IRQ_UART1 (20 + VRC5477_IRQ_BASE)
#define VRC5477_IRQ_SPT0 (21 + VRC5477_IRQ_BASE) /* special purpose timer 0 */ #define VRC5477_IRQ_SPT0 (21 + VRC5477_IRQ_BASE) /* special purpose timer 0 */
#define VRC5477_IRQ_GPT0 (22 + VRC5477_IRQ_BASE) /* general purpose timer 0 */ #define VRC5477_IRQ_GPT0 (22 + VRC5477_IRQ_BASE) /* general purpose timer 0 */
#define VRC5477_IRQ_GPT1 (23 + VRC5477_IRQ_BASE) /* general purpose timer 1 */ #define VRC5477_IRQ_GPT1 (23 + VRC5477_IRQ_BASE) /* general purpose timer 1 */
@ -301,7 +301,7 @@ extern void ll_vrc5477_irq_disable(int vrc5477_irq);
/* /*
* i2859 irq assignment * i2859 irq assignment
*/ */
#define I8259_IRQ_RESERVED_0 (0 + I8259_IRQ_BASE) #define I8259_IRQ_RESERVED_0 (0 + I8259_IRQ_BASE)
#define I8259_IRQ_KEYBOARD (1 + I8259_IRQ_BASE) /* M1543 default */ #define I8259_IRQ_KEYBOARD (1 + I8259_IRQ_BASE) /* M1543 default */
#define I8259_IRQ_CASCADE (2 + I8259_IRQ_BASE) #define I8259_IRQ_CASCADE (2 + I8259_IRQ_BASE)
#define I8259_IRQ_UART_B (3 + I8259_IRQ_BASE) /* M1543 default, may conflict with RTC according to schematic diagram */ #define I8259_IRQ_UART_B (3 + I8259_IRQ_BASE) /* M1543 default, may conflict with RTC according to schematic diagram */

View file

@ -13,7 +13,7 @@
#define _ASM_FPREGDEF_H #define _ASM_FPREGDEF_H
#include <asm/sgidefs.h> #include <asm/sgidefs.h>
#if _MIPS_SIM == _MIPS_SIM_ABI32 #if _MIPS_SIM == _MIPS_SIM_ABI32
/* /*
@ -56,7 +56,7 @@
#define fcr31 $31 /* FPU status register */ #define fcr31 $31 /* FPU status register */
#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
#if _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32 #if _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32
#define fv0 $f0 /* return value */ #define fv0 $f0 /* return value */

Some files were not shown because too many files have changed in this diff Show more