diff options
137 files changed, 596 insertions, 596 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index a33328ef86f7..d27b82595485 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
@@ -177,7 +177,7 @@ cflags-$(CONFIG_CPU_MIPS64) += \ | |||
177 | 177 | ||
178 | cflags-$(CONFIG_CPU_R5000) += \ | 178 | cflags-$(CONFIG_CPU_R5000) += \ |
179 | $(call set_gccflags,r5000,mips4,r5000,mips4,mips2) \ | 179 | $(call set_gccflags,r5000,mips4,r5000,mips4,mips2) \ |
180 | -Wa,--trap | 180 | -Wa,--trap |
181 | 181 | ||
182 | cflags-$(CONFIG_CPU_R5432) += \ | 182 | cflags-$(CONFIG_CPU_R5432) += \ |
183 | $(call set_gccflags,r5400,mips4,r5000,mips4,mips2) \ | 183 | $(call set_gccflags,r5400,mips4,r5000,mips4,mips2) \ |
@@ -720,7 +720,7 @@ archclean: | |||
720 | @$(MAKE) $(clean)=arch/mips/boot | 720 | @$(MAKE) $(clean)=arch/mips/boot |
721 | @$(MAKE) $(clean)=arch/mips/lasat | 721 | @$(MAKE) $(clean)=arch/mips/lasat |
722 | 722 | ||
723 | # Generate <asm/offset.h | 723 | # Generate <asm/offset.h |
724 | # | 724 | # |
725 | # The default rule is suffering from funny problems on MIPS so we using our | 725 | # The default rule is suffering from funny problems on MIPS so we using our |
726 | # own ... | 726 | # own ... |
diff --git a/arch/mips/au1000/common/pci.c b/arch/mips/au1000/common/pci.c index 533721eef6ae..4e5a6e1a9a6e 100644 --- a/arch/mips/au1000/common/pci.c +++ b/arch/mips/au1000/common/pci.c | |||
@@ -40,14 +40,14 @@ | |||
40 | 40 | ||
41 | /* TBD */ | 41 | /* TBD */ |
42 | static struct resource pci_io_resource = { | 42 | static struct resource pci_io_resource = { |
43 | "pci IO space", | 43 | "pci IO space", |
44 | (u32)PCI_IO_START, | 44 | (u32)PCI_IO_START, |
45 | (u32)PCI_IO_END, | 45 | (u32)PCI_IO_END, |
46 | IORESOURCE_IO | 46 | IORESOURCE_IO |
47 | }; | 47 | }; |
48 | 48 | ||
49 | static struct resource pci_mem_resource = { | 49 | static struct resource pci_mem_resource = { |
50 | "pci memory space", | 50 | "pci memory space", |
51 | (u32)PCI_MEM_START, | 51 | (u32)PCI_MEM_START, |
52 | (u32)PCI_MEM_END, | 52 | (u32)PCI_MEM_END, |
53 | IORESOURCE_MEM | 53 | IORESOURCE_MEM |
@@ -68,7 +68,7 @@ static unsigned long virt_io_addr; | |||
68 | static int __init au1x_pci_setup(void) | 68 | static int __init au1x_pci_setup(void) |
69 | { | 69 | { |
70 | #if defined(CONFIG_SOC_AU1500) || defined(CONFIG_SOC_AU1550) | 70 | #if defined(CONFIG_SOC_AU1500) || defined(CONFIG_SOC_AU1550) |
71 | virt_io_addr = (unsigned long)ioremap(Au1500_PCI_IO_START, | 71 | virt_io_addr = (unsigned long)ioremap(Au1500_PCI_IO_START, |
72 | Au1500_PCI_IO_END - Au1500_PCI_IO_START + 1); | 72 | Au1500_PCI_IO_END - Au1500_PCI_IO_START + 1); |
73 | 73 | ||
74 | if (!virt_io_addr) { | 74 | if (!virt_io_addr) { |
@@ -77,7 +77,7 @@ static int __init au1x_pci_setup(void) | |||
77 | } | 77 | } |
78 | 78 | ||
79 | #ifdef CONFIG_DMA_NONCOHERENT | 79 | #ifdef CONFIG_DMA_NONCOHERENT |
80 | /* | 80 | /* |
81 | * Set the NC bit in controller for Au1500 pre-AC silicon | 81 | * Set the NC bit in controller for Au1500 pre-AC silicon |
82 | */ | 82 | */ |
83 | u32 prid = read_c0_prid(); | 83 | u32 prid = read_c0_prid(); |
diff --git a/arch/mips/au1000/common/setup.c b/arch/mips/au1000/common/setup.c index dbc8b1bda963..eff89e109ce6 100644 --- a/arch/mips/au1000/common/setup.c +++ b/arch/mips/au1000/common/setup.c | |||
@@ -97,7 +97,7 @@ static int __init au1x00_setup(void) | |||
97 | argptr = prom_getcmdline(); | 97 | argptr = prom_getcmdline(); |
98 | strcat(argptr, " console=ttyS0,115200"); | 98 | strcat(argptr, " console=ttyS0,115200"); |
99 | } | 99 | } |
100 | #endif | 100 | #endif |
101 | 101 | ||
102 | #ifdef CONFIG_FB_AU1100 | 102 | #ifdef CONFIG_FB_AU1100 |
103 | if ((argptr = strstr(argptr, "video=")) == NULL) { | 103 | if ((argptr = strstr(argptr, "video=")) == NULL) { |
diff --git a/arch/mips/au1000/common/time.c b/arch/mips/au1000/common/time.c index fe418f1620c3..57675b41480e 100644 --- a/arch/mips/au1000/common/time.c +++ b/arch/mips/au1000/common/time.c | |||
@@ -281,7 +281,7 @@ unsigned long cal_r4koff(void) | |||
281 | cpu_speed = count * 2; | 281 | cpu_speed = count * 2; |
282 | } | 282 | } |
283 | #else | 283 | #else |
284 | cpu_speed = (au_readl(SYS_CPUPLL) & 0x0000003f) * | 284 | cpu_speed = (au_readl(SYS_CPUPLL) & 0x0000003f) * |
285 | AU1000_SRC_CLK; | 285 | AU1000_SRC_CLK; |
286 | count = cpu_speed / 2; | 286 | count = cpu_speed / 2; |
287 | #endif | 287 | #endif |
@@ -356,7 +356,7 @@ static unsigned long do_fast_cp0_gettimeoffset(void) | |||
356 | : "hi", "lo", GCC_REG_ACCUM); | 356 | : "hi", "lo", GCC_REG_ACCUM); |
357 | 357 | ||
358 | /* | 358 | /* |
359 | * Due to possible jiffies inconsistencies, we need to check | 359 | * Due to possible jiffies inconsistencies, we need to check |
360 | * the result so that we'll get a timer that is monotonic. | 360 | * the result so that we'll get a timer that is monotonic. |
361 | */ | 361 | */ |
362 | if (res >= USECS_PER_JIFFY) | 362 | if (res >= USECS_PER_JIFFY) |
@@ -375,8 +375,8 @@ static unsigned long do_fast_pm_gettimeoffset(void) | |||
375 | au_sync(); | 375 | au_sync(); |
376 | offset = pc0 - last_pc0; | 376 | offset = pc0 - last_pc0; |
377 | if (offset > 2*MATCH20_INC) { | 377 | if (offset > 2*MATCH20_INC) { |
378 | printk("huge offset %x, last_pc0 %x last_match20 %x pc0 %x\n", | 378 | printk("huge offset %x, last_pc0 %x last_match20 %x pc0 %x\n", |
379 | (unsigned)offset, (unsigned)last_pc0, | 379 | (unsigned)offset, (unsigned)last_pc0, |
380 | (unsigned)last_match20, (unsigned)pc0); | 380 | (unsigned)last_match20, (unsigned)pc0); |
381 | } | 381 | } |
382 | offset = (unsigned long)((offset * 305) / 10); | 382 | offset = (unsigned long)((offset * 305) / 10); |
@@ -394,11 +394,11 @@ void au1xxx_timer_setup(struct irqaction *irq) | |||
394 | r4k_offset = cal_r4koff(); | 394 | r4k_offset = cal_r4koff(); |
395 | printk("%08lx(%d)\n", r4k_offset, (int) r4k_offset); | 395 | printk("%08lx(%d)\n", r4k_offset, (int) r4k_offset); |
396 | 396 | ||
397 | //est_freq = 2*r4k_offset*HZ; | 397 | //est_freq = 2*r4k_offset*HZ; |
398 | est_freq = r4k_offset*HZ; | 398 | est_freq = r4k_offset*HZ; |
399 | est_freq += 5000; /* round */ | 399 | est_freq += 5000; /* round */ |
400 | est_freq -= est_freq%10000; | 400 | est_freq -= est_freq%10000; |
401 | printk("CPU frequency %d.%02d MHz\n", est_freq/1000000, | 401 | printk("CPU frequency %d.%02d MHz\n", est_freq/1000000, |
402 | (est_freq%1000000)*100/1000000); | 402 | (est_freq%1000000)*100/1000000); |
403 | set_au1x00_speed(est_freq); | 403 | set_au1x00_speed(est_freq); |
404 | set_au1x00_lcd_clock(); // program the LCD clock | 404 | set_au1x00_lcd_clock(); // program the LCD clock |
diff --git a/arch/mips/au1000/csb250/board_setup.c b/arch/mips/au1000/csb250/board_setup.c index 90426eaffb23..1c55c5f59d75 100644 --- a/arch/mips/au1000/csb250/board_setup.c +++ b/arch/mips/au1000/csb250/board_setup.c | |||
@@ -182,7 +182,7 @@ void __init board_setup(void) | |||
182 | au_writel(0xf0000000, Au1500_PCI_MWMASK_DEV); | 182 | au_writel(0xf0000000, Au1500_PCI_MWMASK_DEV); |
183 | au_writel(0, Au1500_PCI_MWBASE_REV_CCL); | 183 | au_writel(0, Au1500_PCI_MWBASE_REV_CCL); |
184 | au_writel(0x02a00356, Au1500_PCI_STATCMD); | 184 | au_writel(0x02a00356, Au1500_PCI_STATCMD); |
185 | au_writel(0x00003c04, Au1500_PCI_HDRTYPE); | 185 | au_writel(0x00003c04, Au1500_PCI_HDRTYPE); |
186 | au_writel(0x00000008, Au1500_PCI_MBAR); | 186 | au_writel(0x00000008, Au1500_PCI_MBAR); |
187 | au_sync(); | 187 | au_sync(); |
188 | 188 | ||
@@ -216,7 +216,7 @@ csb250_pci_idsel(unsigned int devsel, int assert) | |||
216 | unsigned int gpio2_pins; | 216 | unsigned int gpio2_pins; |
217 | 217 | ||
218 | retval = 1; | 218 | retval = 1; |
219 | 219 | ||
220 | /* First, disable both selects, then assert the one requested. | 220 | /* First, disable both selects, then assert the one requested. |
221 | */ | 221 | */ |
222 | au_writel(0xc000c000, GPIO2_OUTPUT); | 222 | au_writel(0xc000c000, GPIO2_OUTPUT); |
diff --git a/arch/mips/au1000/csb250/init.c b/arch/mips/au1000/csb250/init.c index 4320057fc439..bd99733abc0b 100644 --- a/arch/mips/au1000/csb250/init.c +++ b/arch/mips/au1000/csb250/init.c | |||
@@ -81,7 +81,7 @@ int __init prom_init(int argc, char **argv, char **envp, int *prom_vec) | |||
81 | csb_env[0] = env1; | 81 | csb_env[0] = env1; |
82 | 82 | ||
83 | mips_machgroup = MACH_GROUP_ALCHEMY; | 83 | mips_machgroup = MACH_GROUP_ALCHEMY; |
84 | mips_machtype = MACH_CSB250; | 84 | mips_machtype = MACH_CSB250; |
85 | 85 | ||
86 | prom_init_cmdline(); | 86 | prom_init_cmdline(); |
87 | memsize_str = prom_getenv("memsize"); | 87 | memsize_str = prom_getenv("memsize"); |
diff --git a/arch/mips/au1000/db1x00/init.c b/arch/mips/au1000/db1x00/init.c index 51eee94a5e82..4b9d5e46edbb 100644 --- a/arch/mips/au1000/db1x00/init.c +++ b/arch/mips/au1000/db1x00/init.c | |||
@@ -61,7 +61,7 @@ void __init prom_init(void) | |||
61 | prom_envp = (char **) fw_arg2; | 61 | prom_envp = (char **) fw_arg2; |
62 | 62 | ||
63 | mips_machgroup = MACH_GROUP_ALCHEMY; | 63 | mips_machgroup = MACH_GROUP_ALCHEMY; |
64 | mips_machtype = MACH_DB1000; /* set the platform # */ | 64 | mips_machtype = MACH_DB1000; /* set the platform # */ |
65 | 65 | ||
66 | prom_init_cmdline(); | 66 | prom_init_cmdline(); |
67 | 67 | ||
diff --git a/arch/mips/au1000/hydrogen3/init.c b/arch/mips/au1000/hydrogen3/init.c index eee4adf98711..8cc9879dd582 100644 --- a/arch/mips/au1000/hydrogen3/init.c +++ b/arch/mips/au1000/hydrogen3/init.c | |||
@@ -63,7 +63,7 @@ int __init prom_init(int argc, char **argv, char **envp, int *prom_vec) | |||
63 | prom_envp = envp; | 63 | prom_envp = envp; |
64 | 64 | ||
65 | mips_machgroup = MACH_GROUP_ALCHEMY; | 65 | mips_machgroup = MACH_GROUP_ALCHEMY; |
66 | mips_machtype = MACH_DB1000; /* set the platform # */ | 66 | mips_machtype = MACH_DB1000; /* set the platform # */ |
67 | prom_init_cmdline(); | 67 | prom_init_cmdline(); |
68 | 68 | ||
69 | memsize_str = prom_getenv("memsize"); | 69 | memsize_str = prom_getenv("memsize"); |
diff --git a/arch/mips/au1000/pb1000/board_setup.c b/arch/mips/au1000/pb1000/board_setup.c index 2fa211b69329..0b4807dc9f44 100644 --- a/arch/mips/au1000/pb1000/board_setup.c +++ b/arch/mips/au1000/pb1000/board_setup.c | |||
@@ -174,7 +174,7 @@ void __init board_setup(void) | |||
174 | case 0x02: /* HB */ | 174 | case 0x02: /* HB */ |
175 | break; | 175 | break; |
176 | default: /* HC and newer */ | 176 | default: /* HC and newer */ |
177 | /* Enable sys bus clock divider when IDLE state or no bus | 177 | /* Enable sys bus clock divider when IDLE state or no bus |
178 | activity. */ | 178 | activity. */ |
179 | au_writel(au_readl(SYS_POWERCTRL) | (0x3 << 5), SYS_POWERCTRL); | 179 | au_writel(au_readl(SYS_POWERCTRL) | (0x3 << 5), SYS_POWERCTRL); |
180 | break; | 180 | break; |
diff --git a/arch/mips/au1000/xxs1500/board_setup.c b/arch/mips/au1000/xxs1500/board_setup.c index 9dadc82536f4..1e59433dfd66 100644 --- a/arch/mips/au1000/xxs1500/board_setup.c +++ b/arch/mips/au1000/xxs1500/board_setup.c | |||
@@ -49,7 +49,7 @@ void board_reset (void) | |||
49 | void __init board_setup(void) | 49 | void __init board_setup(void) |
50 | { | 50 | { |
51 | u32 pin_func; | 51 | u32 pin_func; |
52 | 52 | ||
53 | // set multiple use pins (UART3/GPIO) to UART (it's used as UART too) | 53 | // set multiple use pins (UART3/GPIO) to UART (it's used as UART too) |
54 | pin_func = au_readl(SYS_PINFUNC) & (u32)(~SYS_PF_UR3); | 54 | pin_func = au_readl(SYS_PINFUNC) & (u32)(~SYS_PF_UR3); |
55 | pin_func |= SYS_PF_UR3; | 55 | pin_func |= SYS_PF_UR3; |
@@ -75,11 +75,11 @@ void __init board_setup(void) | |||
75 | au_writel(1, GPIO2_ENABLE); | 75 | au_writel(1, GPIO2_ENABLE); |
76 | /* gpio2 208/9/10/11 are inputs */ | 76 | /* gpio2 208/9/10/11 are inputs */ |
77 | au_writel((1<<8) | (1<<9) | (1<<10) | (1<<11), GPIO2_DIR); | 77 | au_writel((1<<8) | (1<<9) | (1<<10) | (1<<11), GPIO2_DIR); |
78 | 78 | ||
79 | /* turn off power */ | 79 | /* turn off power */ |
80 | au_writel((au_readl(GPIO2_PINSTATE) & ~(1<<14))|(1<<30), GPIO2_OUTPUT); | 80 | au_writel((au_readl(GPIO2_PINSTATE) & ~(1<<14))|(1<<30), GPIO2_OUTPUT); |
81 | #endif | 81 | #endif |
82 | 82 | ||
83 | 83 | ||
84 | #ifdef CONFIG_PCI | 84 | #ifdef CONFIG_PCI |
85 | #if defined(__MIPSEB__) | 85 | #if defined(__MIPSEB__) |
diff --git a/arch/mips/au1000/xxs1500/init.c b/arch/mips/au1000/xxs1500/init.c index 03f755291b51..f1c76533b6fc 100644 --- a/arch/mips/au1000/xxs1500/init.c +++ b/arch/mips/au1000/xxs1500/init.c | |||
@@ -55,7 +55,7 @@ void __init prom_init(void) | |||
55 | prom_envp = (char **) fw_arg2; | 55 | prom_envp = (char **) fw_arg2; |
56 | 56 | ||
57 | mips_machgroup = MACH_GROUP_ALCHEMY; | 57 | mips_machgroup = MACH_GROUP_ALCHEMY; |
58 | mips_machtype = MACH_XXS1500; /* set the platform # */ | 58 | mips_machtype = MACH_XXS1500; /* set the platform # */ |
59 | 59 | ||
60 | prom_init_cmdline(); | 60 | prom_init_cmdline(); |
61 | 61 | ||
diff --git a/arch/mips/au1000/xxs1500/irqmap.c b/arch/mips/au1000/xxs1500/irqmap.c index 954800a0ab52..52f2f7daeb05 100644 --- a/arch/mips/au1000/xxs1500/irqmap.c +++ b/arch/mips/au1000/xxs1500/irqmap.c | |||
@@ -56,7 +56,7 @@ au1xxx_irq_map_t au1xxx_irq_map[] = { | |||
56 | { AU1500_GPIO_207, INTC_INT_LOW_LEVEL, 0 }, | 56 | { AU1500_GPIO_207, INTC_INT_LOW_LEVEL, 0 }, |
57 | 57 | ||
58 | { AU1000_GPIO_0, INTC_INT_LOW_LEVEL, 0 }, | 58 | { AU1000_GPIO_0, INTC_INT_LOW_LEVEL, 0 }, |
59 | { AU1000_GPIO_1, INTC_INT_LOW_LEVEL, 0 }, | 59 | { AU1000_GPIO_1, INTC_INT_LOW_LEVEL, 0 }, |
60 | { AU1000_GPIO_2, INTC_INT_LOW_LEVEL, 0 }, | 60 | { AU1000_GPIO_2, INTC_INT_LOW_LEVEL, 0 }, |
61 | { AU1000_GPIO_3, INTC_INT_LOW_LEVEL, 0 }, | 61 | { AU1000_GPIO_3, INTC_INT_LOW_LEVEL, 0 }, |
62 | { AU1000_GPIO_4, INTC_INT_LOW_LEVEL, 0 }, /* CF interrupt */ | 62 | { AU1000_GPIO_4, INTC_INT_LOW_LEVEL, 0 }, /* CF interrupt */ |
diff --git a/arch/mips/ddb5xxx/ddb5477/irq.c b/arch/mips/ddb5xxx/ddb5477/irq.c index 5f027bfa4af8..9ffe1a9142ca 100644 --- a/arch/mips/ddb5xxx/ddb5477/irq.c +++ b/arch/mips/ddb5xxx/ddb5477/irq.c | |||
@@ -76,7 +76,7 @@ set_pci_int_attr(u32 pci, u32 intn, u32 active, u32 trigger) | |||
76 | extern void vrc5477_irq_init(u32 base); | 76 | extern void vrc5477_irq_init(u32 base); |
77 | extern void mips_cpu_irq_init(u32 base); | 77 | extern void mips_cpu_irq_init(u32 base); |
78 | extern asmlinkage void ddb5477_handle_int(void); | 78 | extern asmlinkage void ddb5477_handle_int(void); |
79 | extern int setup_irq(unsigned int irq, struct irqaction *irqaction); | 79 | extern int setup_irq(unsigned int irq, struct irqaction *irqaction); |
80 | static struct irqaction irq_cascade = { no_action, 0, CPU_MASK_NONE, "cascade", NULL, NULL }; | 80 | static struct irqaction irq_cascade = { no_action, 0, CPU_MASK_NONE, "cascade", NULL, NULL }; |
81 | 81 | ||
82 | void __init arch_init_irq(void) | 82 | void __init arch_init_irq(void) |
@@ -94,7 +94,7 @@ void __init arch_init_irq(void) | |||
94 | /* setup PCI interrupt attributes */ | 94 | /* setup PCI interrupt attributes */ |
95 | set_pci_int_attr(PCI0, INTA, ACTIVE_LOW, LEVEL_SENSE); | 95 | set_pci_int_attr(PCI0, INTA, ACTIVE_LOW, LEVEL_SENSE); |
96 | set_pci_int_attr(PCI0, INTB, ACTIVE_LOW, LEVEL_SENSE); | 96 | set_pci_int_attr(PCI0, INTB, ACTIVE_LOW, LEVEL_SENSE); |
97 | if (mips_machtype == MACH_NEC_ROCKHOPPERII) | 97 | if (mips_machtype == MACH_NEC_ROCKHOPPERII) |
98 | set_pci_int_attr(PCI0, INTC, ACTIVE_HIGH, LEVEL_SENSE); | 98 | set_pci_int_attr(PCI0, INTC, ACTIVE_HIGH, LEVEL_SENSE); |
99 | else | 99 | else |
100 | set_pci_int_attr(PCI0, INTC, ACTIVE_LOW, LEVEL_SENSE); | 100 | set_pci_int_attr(PCI0, INTC, ACTIVE_LOW, LEVEL_SENSE); |
@@ -134,7 +134,7 @@ void __init arch_init_irq(void) | |||
134 | 134 | ||
135 | /* setup cascade interrupts */ | 135 | /* setup cascade interrupts */ |
136 | setup_irq(VRC5477_IRQ_BASE + VRC5477_I8259_CASCADE, &irq_cascade); | 136 | setup_irq(VRC5477_IRQ_BASE + VRC5477_I8259_CASCADE, &irq_cascade); |
137 | setup_irq(CPU_IRQ_BASE + CPU_VRC5477_CASCADE, &irq_cascade); | 137 | setup_irq(CPU_IRQ_BASE + CPU_VRC5477_CASCADE, &irq_cascade); |
138 | 138 | ||
139 | /* hook up the first-level interrupt handler */ | 139 | /* hook up the first-level interrupt handler */ |
140 | set_except_vector(0, ddb5477_handle_int); | 140 | set_except_vector(0, ddb5477_handle_int); |
diff --git a/arch/mips/ddb5xxx/ddb5477/setup.c b/arch/mips/ddb5xxx/ddb5477/setup.c index 15c6e543b56f..d62f5a789b05 100644 --- a/arch/mips/ddb5xxx/ddb5477/setup.c +++ b/arch/mips/ddb5xxx/ddb5477/setup.c | |||
@@ -141,7 +141,7 @@ static void __init ddb_time_init(void) | |||
141 | 141 | ||
142 | /* mips_hpt_frequency is 1/2 of the cpu core freq */ | 142 | /* mips_hpt_frequency is 1/2 of the cpu core freq */ |
143 | i = (read_c0_config() >> 28 ) & 7; | 143 | i = (read_c0_config() >> 28 ) & 7; |
144 | if ((current_cpu_data.cputype == CPU_R5432) && (i == 3)) | 144 | if ((current_cpu_data.cputype == CPU_R5432) && (i == 3)) |
145 | i = 4; | 145 | i = 4; |
146 | mips_hpt_frequency = bus_frequency*(i+4)/4; | 146 | mips_hpt_frequency = bus_frequency*(i+4)/4; |
147 | } | 147 | } |
@@ -298,11 +298,11 @@ static void __init ddb5477_board_init(void) | |||
298 | 298 | ||
299 | if (mips_machtype == MACH_NEC_ROCKHOPPER | 299 | if (mips_machtype == MACH_NEC_ROCKHOPPER |
300 | || mips_machtype == MACH_NEC_ROCKHOPPERII) { | 300 | || mips_machtype == MACH_NEC_ROCKHOPPERII) { |
301 | /* Disable bus diagnostics. */ | 301 | /* Disable bus diagnostics. */ |
302 | ddb_out32(DDB_PCICTL0_L, 0); | 302 | ddb_out32(DDB_PCICTL0_L, 0); |
303 | ddb_out32(DDB_PCICTL0_H, 0); | 303 | ddb_out32(DDB_PCICTL0_H, 0); |
304 | ddb_out32(DDB_PCICTL1_L, 0); | 304 | ddb_out32(DDB_PCICTL1_L, 0); |
305 | ddb_out32(DDB_PCICTL1_H, 0); | 305 | ddb_out32(DDB_PCICTL1_H, 0); |
306 | } | 306 | } |
307 | 307 | ||
308 | if (mips_machtype == MACH_NEC_ROCKHOPPER) { | 308 | if (mips_machtype == MACH_NEC_ROCKHOPPER) { |
@@ -354,7 +354,7 @@ static void __init ddb5477_board_init(void) | |||
354 | */ | 354 | */ |
355 | pci_write_config_byte(&dev_m1533, 0x58, 0x74); | 355 | pci_write_config_byte(&dev_m1533, 0x58, 0x74); |
356 | 356 | ||
357 | /* | 357 | /* |
358 | * positive decode (bit6 -0) | 358 | * positive decode (bit6 -0) |
359 | * enable IDE controler interrupt (bit 4 -1) | 359 | * enable IDE controler interrupt (bit 4 -1) |
360 | * setup SIRQ to point to IRQ 14 (bit 3:0 - 1101) | 360 | * setup SIRQ to point to IRQ 14 (bit 3:0 - 1101) |
@@ -364,31 +364,31 @@ static void __init ddb5477_board_init(void) | |||
364 | /* Setup M5229 registers */ | 364 | /* Setup M5229 registers */ |
365 | dev_m5229.bus = &bus; | 365 | dev_m5229.bus = &bus; |
366 | dev_m5229.sysdata = NULL; | 366 | dev_m5229.sysdata = NULL; |
367 | dev_m5229.devfn = 4*8; // slot 4 (AD15): M5229 IDE | 367 | dev_m5229.devfn = 4*8; // slot 4 (AD15): M5229 IDE |
368 | 368 | ||
369 | /* | 369 | /* |
370 | * enable IDE in the M5229 config register 0x50 (bit 0 - 1) | 370 | * enable IDE in the M5229 config register 0x50 (bit 0 - 1) |
371 | * M5229 IDSEL is addr:15; see above setting | 371 | * M5229 IDSEL is addr:15; see above setting |
372 | */ | 372 | */ |
373 | pci_read_config_byte(&dev_m5229, 0x50, &temp8); | 373 | pci_read_config_byte(&dev_m5229, 0x50, &temp8); |
374 | pci_write_config_byte(&dev_m5229, 0x50, temp8 | 0x1); | 374 | pci_write_config_byte(&dev_m5229, 0x50, temp8 | 0x1); |
375 | 375 | ||
376 | /* | 376 | /* |
377 | * enable bus master (bit 2) and IO decoding (bit 0) | 377 | * enable bus master (bit 2) and IO decoding (bit 0) |
378 | */ | 378 | */ |
379 | pci_read_config_byte(&dev_m5229, 0x04, &temp8); | 379 | pci_read_config_byte(&dev_m5229, 0x04, &temp8); |
380 | pci_write_config_byte(&dev_m5229, 0x04, temp8 | 0x5); | 380 | pci_write_config_byte(&dev_m5229, 0x04, temp8 | 0x5); |
381 | 381 | ||
382 | /* | 382 | /* |
383 | * enable native, copied from arch/ppc/k2boot/head.S | 383 | * enable native, copied from arch/ppc/k2boot/head.S |
384 | * TODO - need volatile, need to be portable | 384 | * TODO - need volatile, need to be portable |
385 | */ | 385 | */ |
386 | pci_write_config_byte(&dev_m5229, 0x09, 0xef); | 386 | pci_write_config_byte(&dev_m5229, 0x09, 0xef); |
387 | 387 | ||
388 | /* Set Primary Channel Command Block Timing */ | 388 | /* Set Primary Channel Command Block Timing */ |
389 | pci_write_config_byte(&dev_m5229, 0x59, 0x31); | 389 | pci_write_config_byte(&dev_m5229, 0x59, 0x31); |
390 | 390 | ||
391 | /* | 391 | /* |
392 | * Enable primary channel 40-pin cable | 392 | * Enable primary channel 40-pin cable |
393 | * M5229 register 0x4a (bit 0) | 393 | * M5229 register 0x4a (bit 0) |
394 | */ | 394 | */ |
diff --git a/arch/mips/dec/ecc-berr.c b/arch/mips/dec/ecc-berr.c index 133fb7c48e6c..6dbce92eb068 100644 --- a/arch/mips/dec/ecc-berr.c +++ b/arch/mips/dec/ecc-berr.c | |||
@@ -253,7 +253,7 @@ static inline void dec_kn03_be_init(void) | |||
253 | 253 | ||
254 | kn0x_erraddr = (void *)(KN03_SLOT_BASE + IOASIC_ERRADDR); | 254 | kn0x_erraddr = (void *)(KN03_SLOT_BASE + IOASIC_ERRADDR); |
255 | kn0x_chksyn = (void *)(KN03_SLOT_BASE + IOASIC_CHKSYN); | 255 | kn0x_chksyn = (void *)(KN03_SLOT_BASE + IOASIC_CHKSYN); |
256 | 256 | ||
257 | /* | 257 | /* |
258 | * Set normal ECC detection and generation, enable ECC correction. | 258 | * Set normal ECC detection and generation, enable ECC correction. |
259 | * For KN05 we also need to make sure EE (?) is enabled in the MB. | 259 | * For KN05 we also need to make sure EE (?) is enabled in the MB. |
diff --git a/arch/mips/ite-boards/generic/it8172_setup.c b/arch/mips/ite-boards/generic/it8172_setup.c index d808a67294b8..a5f6d84bc181 100644 --- a/arch/mips/ite-boards/generic/it8172_setup.c +++ b/arch/mips/ite-boards/generic/it8172_setup.c | |||
@@ -129,7 +129,7 @@ static void __init it8172_setup(void) | |||
129 | 129 | ||
130 | /* | 130 | /* |
131 | * IO/MEM resources. | 131 | * IO/MEM resources. |
132 | * | 132 | * |
133 | * revisit this area. | 133 | * revisit this area. |
134 | */ | 134 | */ |
135 | set_io_port_base(KSEG1); | 135 | set_io_port_base(KSEG1); |
diff --git a/arch/mips/ite-boards/generic/time.c b/arch/mips/ite-boards/generic/time.c index 30a6c0d5fc50..f5d67ee21ac6 100644 --- a/arch/mips/ite-boards/generic/time.c +++ b/arch/mips/ite-boards/generic/time.c | |||
@@ -72,7 +72,7 @@ static inline int rtc_dm_binary(void) { return saved_control & RTC_DM_BINARY; } | |||
72 | static inline unsigned char | 72 | static inline unsigned char |
73 | bin_to_hw(unsigned char c) | 73 | bin_to_hw(unsigned char c) |
74 | { | 74 | { |
75 | if (rtc_dm_binary()) | 75 | if (rtc_dm_binary()) |
76 | return c; | 76 | return c; |
77 | else | 77 | else |
78 | return ((c/10) << 4) + (c%10); | 78 | return ((c/10) << 4) + (c%10); |
@@ -91,9 +91,9 @@ hw_to_bin(unsigned char c) | |||
91 | static inline unsigned char | 91 | static inline unsigned char |
92 | hour_bin_to_hw(unsigned char c) | 92 | hour_bin_to_hw(unsigned char c) |
93 | { | 93 | { |
94 | if (rtc_24h()) | 94 | if (rtc_24h()) |
95 | return bin_to_hw(c); | 95 | return bin_to_hw(c); |
96 | if (c >= 12) | 96 | if (c >= 12) |
97 | return 0x80 | bin_to_hw((c==12)?12:c-12); /* 12 is 12pm */ | 97 | return 0x80 | bin_to_hw((c==12)?12:c-12); /* 12 is 12pm */ |
98 | else | 98 | else |
99 | return bin_to_hw((c==0)?12:c); /* 0 is 12 AM, not 0 am */ | 99 | 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) | |||
105 | unsigned char tmp = hw_to_bin(c&0x3f); | 105 | unsigned char tmp = hw_to_bin(c&0x3f); |
106 | if (rtc_24h()) | 106 | if (rtc_24h()) |
107 | return tmp; | 107 | return tmp; |
108 | if (c & 0x80) | 108 | if (c & 0x80) |
109 | return (tmp==12)?12:tmp+12; /* 12pm is 12, not 24 */ | 109 | return (tmp==12)?12:tmp+12; /* 12pm is 12, not 24 */ |
110 | else | 110 | else |
111 | return (tmp==12)?0:tmp; /* 12am is 0 */ | 111 | return (tmp==12)?0:tmp; /* 12am is 0 */ |
112 | } | 112 | } |
113 | 113 | ||
@@ -145,7 +145,7 @@ static unsigned long __init cal_r4koff(void) | |||
145 | return (mips_hpt_frequency / HZ); | 145 | return (mips_hpt_frequency / HZ); |
146 | } | 146 | } |
147 | 147 | ||
148 | static unsigned long | 148 | static unsigned long |
149 | it8172_rtc_get_time(void) | 149 | it8172_rtc_get_time(void) |
150 | { | 150 | { |
151 | unsigned int year, mon, day, hour, min, sec; | 151 | unsigned int year, mon, day, hour, min, sec; |
@@ -166,12 +166,12 @@ it8172_rtc_get_time(void) | |||
166 | hour = hour_hw_to_bin(CMOS_READ(RTC_HOURS)); | 166 | hour = hour_hw_to_bin(CMOS_READ(RTC_HOURS)); |
167 | day = hw_to_bin(CMOS_READ(RTC_DAY_OF_MONTH)); | 167 | day = hw_to_bin(CMOS_READ(RTC_DAY_OF_MONTH)); |
168 | mon = hw_to_bin(CMOS_READ(RTC_MONTH)); | 168 | mon = hw_to_bin(CMOS_READ(RTC_MONTH)); |
169 | year = hw_to_bin(CMOS_READ(RTC_YEAR)) + | 169 | year = hw_to_bin(CMOS_READ(RTC_YEAR)) + |
170 | hw_to_bin(*rtc_century_reg) * 100; | 170 | hw_to_bin(*rtc_century_reg) * 100; |
171 | 171 | ||
172 | /* restore interrupts */ | 172 | /* restore interrupts */ |
173 | local_irq_restore(flags); | 173 | local_irq_restore(flags); |
174 | 174 | ||
175 | return mktime(year, mon, day, hour, min, sec); | 175 | return mktime(year, mon, day, hour, min, sec); |
176 | } | 176 | } |
177 | 177 | ||
diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c index ed47041f3030..6b645fbb1ddc 100644 --- a/arch/mips/kernel/binfmt_elfn32.c +++ b/arch/mips/kernel/binfmt_elfn32.c | |||
@@ -103,7 +103,7 @@ jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value) | |||
103 | * Convert jiffies to nanoseconds and seperate with | 103 | * Convert jiffies to nanoseconds and seperate with |
104 | * one divide. | 104 | * one divide. |
105 | */ | 105 | */ |
106 | u64 nsec = (u64)jiffies * TICK_NSEC; | 106 | u64 nsec = (u64)jiffies * TICK_NSEC; |
107 | value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &value->tv_usec); | 107 | value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &value->tv_usec); |
108 | value->tv_usec /= NSEC_PER_USEC; | 108 | value->tv_usec /= NSEC_PER_USEC; |
109 | } | 109 | } |
diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c index ee21b18c37a8..b4075e99c452 100644 --- a/arch/mips/kernel/binfmt_elfo32.c +++ b/arch/mips/kernel/binfmt_elfo32.c | |||
@@ -105,7 +105,7 @@ jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value) | |||
105 | * Convert jiffies to nanoseconds and seperate with | 105 | * Convert jiffies to nanoseconds and seperate with |
106 | * one divide. | 106 | * one divide. |
107 | */ | 107 | */ |
108 | u64 nsec = (u64)jiffies * TICK_NSEC; | 108 | u64 nsec = (u64)jiffies * TICK_NSEC; |
109 | value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &value->tv_usec); | 109 | value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &value->tv_usec); |
110 | value->tv_usec /= NSEC_PER_USEC; | 110 | value->tv_usec /= NSEC_PER_USEC; |
111 | } | 111 | } |
diff --git a/arch/mips/kernel/cpu-bugs64.c b/arch/mips/kernel/cpu-bugs64.c index 11ebe5d4c446..47a087b6c11b 100644 --- a/arch/mips/kernel/cpu-bugs64.c +++ b/arch/mips/kernel/cpu-bugs64.c | |||
@@ -137,7 +137,7 @@ static inline void check_mult_sh(void) | |||
137 | for (i = 0; i < 8; i++) | 137 | for (i = 0; i < 8; i++) |
138 | if (v1[i] != w[i]) | 138 | if (v1[i] != w[i]) |
139 | bug = 1; | 139 | bug = 1; |
140 | 140 | ||
141 | if (bug == 0) { | 141 | if (bug == 0) { |
142 | printk("no.\n"); | 142 | printk("no.\n"); |
143 | return; | 143 | return; |
@@ -149,7 +149,7 @@ static inline void check_mult_sh(void) | |||
149 | for (i = 0; i < 8; i++) | 149 | for (i = 0; i < 8; i++) |
150 | if (v2[i] != w[i]) | 150 | if (v2[i] != w[i]) |
151 | fix = 0; | 151 | fix = 0; |
152 | 152 | ||
153 | if (fix == 1) { | 153 | if (fix == 1) { |
154 | printk("yes.\n"); | 154 | printk("yes.\n"); |
155 | return; | 155 | return; |
diff --git a/arch/mips/kernel/gdb-stub.c b/arch/mips/kernel/gdb-stub.c index 269889302a27..d3fd1ab14274 100644 --- a/arch/mips/kernel/gdb-stub.c +++ b/arch/mips/kernel/gdb-stub.c | |||
@@ -687,8 +687,8 @@ void handle_exception (struct gdb_regs *regs) | |||
687 | * acquire the big kgdb spinlock | 687 | * acquire the big kgdb spinlock |
688 | */ | 688 | */ |
689 | if (!spin_trylock(&kgdb_lock)) { | 689 | if (!spin_trylock(&kgdb_lock)) { |
690 | /* | 690 | /* |
691 | * some other CPU has the lock, we should go back to | 691 | * some other CPU has the lock, we should go back to |
692 | * receive the gdb_wait IPC | 692 | * receive the gdb_wait IPC |
693 | */ | 693 | */ |
694 | return; | 694 | return; |
@@ -703,7 +703,7 @@ void handle_exception (struct gdb_regs *regs) | |||
703 | async_bp.addr = 0; | 703 | async_bp.addr = 0; |
704 | } | 704 | } |
705 | 705 | ||
706 | /* | 706 | /* |
707 | * acquire the CPU spinlocks | 707 | * acquire the CPU spinlocks |
708 | */ | 708 | */ |
709 | for (i = num_online_cpus()-1; i >= 0; i--) | 709 | for (i = num_online_cpus()-1; i >= 0; i--) |
@@ -894,7 +894,7 @@ void handle_exception (struct gdb_regs *regs) | |||
894 | ptr = &input_buffer[1]; | 894 | ptr = &input_buffer[1]; |
895 | if (hexToLong(&ptr, &addr)) | 895 | if (hexToLong(&ptr, &addr)) |
896 | regs->cp0_epc = addr; | 896 | regs->cp0_epc = addr; |
897 | 897 | ||
898 | goto exit_kgdb_exception; | 898 | goto exit_kgdb_exception; |
899 | break; | 899 | break; |
900 | 900 | ||
@@ -1001,7 +1001,7 @@ void breakpoint(void) | |||
1001 | return; | 1001 | return; |
1002 | 1002 | ||
1003 | __asm__ __volatile__( | 1003 | __asm__ __volatile__( |
1004 | ".globl breakinst\n\t" | 1004 | ".globl breakinst\n\t" |
1005 | ".set\tnoreorder\n\t" | 1005 | ".set\tnoreorder\n\t" |
1006 | "nop\n" | 1006 | "nop\n" |
1007 | "breakinst:\tbreak\n\t" | 1007 | "breakinst:\tbreak\n\t" |
@@ -1014,7 +1014,7 @@ void breakpoint(void) | |||
1014 | void async_breakpoint(void) | 1014 | void async_breakpoint(void) |
1015 | { | 1015 | { |
1016 | __asm__ __volatile__( | 1016 | __asm__ __volatile__( |
1017 | ".globl async_breakinst\n\t" | 1017 | ".globl async_breakinst\n\t" |
1018 | ".set\tnoreorder\n\t" | 1018 | ".set\tnoreorder\n\t" |
1019 | "nop\n" | 1019 | "nop\n" |
1020 | "async_breakinst:\tbreak\n\t" | 1020 | "async_breakinst:\tbreak\n\t" |
diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S index 3a1a3e7586f6..9bb2caaf7fc6 100644 --- a/arch/mips/kernel/genex.S +++ b/arch/mips/kernel/genex.S | |||
@@ -246,10 +246,10 @@ NESTED(nmi_handler, PT_SIZE, sp) | |||
246 | LONG_L a1, PT_EPC(sp) | 246 | LONG_L a1, PT_EPC(sp) |
247 | #if CONFIG_32BIT | 247 | #if CONFIG_32BIT |
248 | PRINT("Got \nexception at %08lx\012") | 248 | PRINT("Got \nexception at %08lx\012") |
249 | #endif | 249 | #endif |
250 | #if CONFIG_64BIT | 250 | #if CONFIG_64BIT |
251 | PRINT("Got \nexception at %016lx\012") | 251 | PRINT("Got \nexception at %016lx\012") |
252 | #endif | 252 | #endif |
253 | .endm | 253 | .endm |
254 | 254 | ||
255 | .macro __BUILD_count exception | 255 | .macro __BUILD_count exception |
diff --git a/arch/mips/kernel/ioctl32.c b/arch/mips/kernel/ioctl32.c index 519cd5d0aebb..c069719ff0d8 100644 --- a/arch/mips/kernel/ioctl32.c +++ b/arch/mips/kernel/ioctl32.c | |||
@@ -27,7 +27,7 @@ long sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg); | |||
27 | #include "compat_ioctl.c" | 27 | #include "compat_ioctl.c" |
28 | 28 | ||
29 | typedef int (* ioctl32_handler_t)(unsigned int, unsigned int, unsigned long, struct file *); | 29 | typedef int (* ioctl32_handler_t)(unsigned int, unsigned int, unsigned long, struct file *); |
30 | 30 | ||
31 | #define COMPATIBLE_IOCTL(cmd) HANDLE_IOCTL((cmd),sys_ioctl) | 31 | #define COMPATIBLE_IOCTL(cmd) HANDLE_IOCTL((cmd),sys_ioctl) |
32 | #define HANDLE_IOCTL(cmd,handler) { (cmd), (ioctl32_handler_t)(handler), NULL }, | 32 | #define HANDLE_IOCTL(cmd,handler) { (cmd), (ioctl32_handler_t)(handler), NULL }, |
33 | #define IOCTL_TABLE_START \ | 33 | #define IOCTL_TABLE_START \ |
diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c index 441157a1f994..7d93992e462c 100644 --- a/arch/mips/kernel/irq.c +++ b/arch/mips/kernel/irq.c | |||
@@ -77,7 +77,7 @@ int show_interrupts(struct seq_file *p, void *v) | |||
77 | if (i < NR_IRQS) { | 77 | if (i < NR_IRQS) { |
78 | spin_lock_irqsave(&irq_desc[i].lock, flags); | 78 | spin_lock_irqsave(&irq_desc[i].lock, flags); |
79 | action = irq_desc[i].action; | 79 | action = irq_desc[i].action; |
80 | if (!action) | 80 | if (!action) |
81 | goto skip; | 81 | goto skip; |
82 | seq_printf(p, "%3d: ",i); | 82 | seq_printf(p, "%3d: ",i); |
83 | #ifndef CONFIG_SMP | 83 | #ifndef CONFIG_SMP |
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c index 993abc868e54..4613219dd73e 100644 --- a/arch/mips/kernel/linux32.c +++ b/arch/mips/kernel/linux32.c | |||
@@ -313,7 +313,7 @@ asmlinkage int sys32_sysinfo(struct sysinfo32 *info) | |||
313 | struct sysinfo s; | 313 | struct sysinfo s; |
314 | int ret, err; | 314 | int ret, err; |
315 | mm_segment_t old_fs = get_fs (); | 315 | mm_segment_t old_fs = get_fs (); |
316 | 316 | ||
317 | set_fs (KERNEL_DS); | 317 | set_fs (KERNEL_DS); |
318 | ret = sys_sysinfo(&s); | 318 | ret = sys_sysinfo(&s); |
319 | set_fs (old_fs); | 319 | set_fs (old_fs); |
@@ -560,7 +560,7 @@ struct ipc64_perm32 { | |||
560 | compat_gid_t gid; | 560 | compat_gid_t gid; |
561 | compat_uid_t cuid; | 561 | compat_uid_t cuid; |
562 | compat_gid_t cgid; | 562 | compat_gid_t cgid; |
563 | compat_mode_t mode; | 563 | compat_mode_t mode; |
564 | unsigned short seq; | 564 | unsigned short seq; |
565 | unsigned short __pad1; | 565 | unsigned short __pad1; |
566 | unsigned int __unused1; | 566 | unsigned int __unused1; |
@@ -1334,17 +1334,17 @@ asmlinkage int sys32_sendfile(int out_fd, int in_fd, compat_off_t *offset, | |||
1334 | mm_segment_t old_fs = get_fs(); | 1334 | mm_segment_t old_fs = get_fs(); |
1335 | int ret; | 1335 | int ret; |
1336 | off_t of; | 1336 | off_t of; |
1337 | 1337 | ||
1338 | if (offset && get_user(of, offset)) | 1338 | if (offset && get_user(of, offset)) |
1339 | return -EFAULT; | 1339 | return -EFAULT; |
1340 | 1340 | ||
1341 | set_fs(KERNEL_DS); | 1341 | set_fs(KERNEL_DS); |
1342 | ret = sys_sendfile(out_fd, in_fd, offset ? &of : NULL, count); | 1342 | ret = sys_sendfile(out_fd, in_fd, offset ? &of : NULL, count); |
1343 | set_fs(old_fs); | 1343 | set_fs(old_fs); |
1344 | 1344 | ||
1345 | if (offset && put_user(of, offset)) | 1345 | if (offset && put_user(of, offset)) |
1346 | return -EFAULT; | 1346 | return -EFAULT; |
1347 | 1347 | ||
1348 | return ret; | 1348 | return ret; |
1349 | } | 1349 | } |
1350 | 1350 | ||
@@ -1362,11 +1362,11 @@ static unsigned char socketcall_nargs[18]={AL(0),AL(3),AL(3),AL(3),AL(2),AL(3), | |||
1362 | #undef AL | 1362 | #undef AL |
1363 | 1363 | ||
1364 | /* | 1364 | /* |
1365 | * System call vectors. | 1365 | * System call vectors. |
1366 | * | 1366 | * |
1367 | * Argument checking cleaned up. Saved 20% in size. | 1367 | * Argument checking cleaned up. Saved 20% in size. |
1368 | * This function doesn't need to set the kernel lock because | 1368 | * This function doesn't need to set the kernel lock because |
1369 | * it is set by the callees. | 1369 | * it is set by the callees. |
1370 | */ | 1370 | */ |
1371 | 1371 | ||
1372 | asmlinkage long sys32_socketcall(int call, unsigned int *args32) | 1372 | asmlinkage long sys32_socketcall(int call, unsigned int *args32) |
@@ -1402,11 +1402,11 @@ asmlinkage long sys32_socketcall(int call, unsigned int *args32) | |||
1402 | /* copy_from_user should be SMP safe. */ | 1402 | /* copy_from_user should be SMP safe. */ |
1403 | if (copy_from_user(a, args32, socketcall_nargs[call])) | 1403 | if (copy_from_user(a, args32, socketcall_nargs[call])) |
1404 | return -EFAULT; | 1404 | return -EFAULT; |
1405 | 1405 | ||
1406 | a0=a[0]; | 1406 | a0=a[0]; |
1407 | a1=a[1]; | 1407 | a1=a[1]; |
1408 | 1408 | ||
1409 | switch(call) | 1409 | switch(call) |
1410 | { | 1410 | { |
1411 | case SYS_SOCKET: | 1411 | case SYS_SOCKET: |
1412 | err = sys_socket(a0,a1,a[2]); | 1412 | err = sys_socket(a0,a1,a[2]); |
diff --git a/arch/mips/kernel/r2300_switch.S b/arch/mips/kernel/r2300_switch.S index 243e7b629af6..f10019640ee9 100644 --- a/arch/mips/kernel/r2300_switch.S +++ b/arch/mips/kernel/r2300_switch.S | |||
@@ -35,7 +35,7 @@ | |||
35 | /* | 35 | /* |
36 | * FPU context is saved iff the process has used it's FPU in the current | 36 | * FPU context is saved iff the process has used it's FPU in the current |
37 | * time slice as indicated by TIF_USEDFPU. In any case, the CU1 bit for user | 37 | * time slice as indicated by TIF_USEDFPU. In any case, the CU1 bit for user |
38 | * space STATUS register should be 0, so that a process *always* starts its | 38 | * space STATUS register should be 0, so that a process *always* starts its |
39 | * userland with FPU disabled after each context switch. | 39 | * userland with FPU disabled after each context switch. |
40 | * | 40 | * |
41 | * FPU will be enabled as soon as the process accesses FPU again, through | 41 | * FPU will be enabled as soon as the process accesses FPU again, through |
@@ -55,7 +55,7 @@ LEAF(resume) | |||
55 | cpu_save_nonscratch a0 | 55 | cpu_save_nonscratch a0 |
56 | sw ra, THREAD_REG31(a0) | 56 | sw ra, THREAD_REG31(a0) |
57 | 57 | ||
58 | /* | 58 | /* |
59 | * check if we need to save FPU registers | 59 | * check if we need to save FPU registers |
60 | */ | 60 | */ |
61 | lw t3, TASK_THREAD_INFO(a0) | 61 | lw t3, TASK_THREAD_INFO(a0) |
diff --git a/arch/mips/kernel/r4k_switch.S b/arch/mips/kernel/r4k_switch.S index 175dd1fcbb33..e02b7722ccb8 100644 --- a/arch/mips/kernel/r4k_switch.S +++ b/arch/mips/kernel/r4k_switch.S | |||
@@ -33,7 +33,7 @@ | |||
33 | /* | 33 | /* |
34 | * FPU context is saved iff the process has used it's FPU in the current | 34 | * FPU context is saved iff the process has used it's FPU in the current |
35 | * time slice as indicated by _TIF_USEDFPU. In any case, the CU1 bit for user | 35 | * time slice as indicated by _TIF_USEDFPU. In any case, the CU1 bit for user |
36 | * space STATUS register should be 0, so that a process *always* starts its | 36 | * space STATUS register should be 0, so that a process *always* starts its |
37 | * userland with FPU disabled after each context switch. | 37 | * userland with FPU disabled after each context switch. |
38 | * | 38 | * |
39 | * FPU will be enabled as soon as the process accesses FPU again, through | 39 | * FPU will be enabled as soon as the process accesses FPU again, through |
@@ -164,7 +164,7 @@ LEAF(_init_fpu) | |||
164 | dmtc1 t1, $f31 | 164 | dmtc1 t1, $f31 |
165 | 1: | 165 | 1: |
166 | #endif | 166 | #endif |
167 | 167 | ||
168 | #ifdef CONFIG_CPU_MIPS32 | 168 | #ifdef CONFIG_CPU_MIPS32 |
169 | mtc1 t1, $f0 | 169 | mtc1 t1, $f0 |
170 | mtc1 t1, $f1 | 170 | mtc1 t1, $f1 |
diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c index f6875f023a29..8ddfbd8d425a 100644 --- a/arch/mips/kernel/signal32.c +++ b/arch/mips/kernel/signal32.c | |||
@@ -558,7 +558,7 @@ static inline int setup_sigcontext32(struct pt_regs *regs, | |||
558 | if (!used_math()) | 558 | if (!used_math()) |
559 | goto out; | 559 | goto out; |
560 | 560 | ||
561 | /* | 561 | /* |
562 | * Save FPU state to signal context. Signal handler will "inherit" | 562 | * Save FPU state to signal context. Signal handler will "inherit" |
563 | * current FPU state. | 563 | * current FPU state. |
564 | */ | 564 | */ |
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S index e830d788c106..482ac310c937 100644 --- a/arch/mips/kernel/vmlinux.lds.S +++ b/arch/mips/kernel/vmlinux.lds.S | |||
@@ -15,7 +15,7 @@ SECTIONS | |||
15 | /* This is the value for an Origin kernel, taken from an IRIX kernel. */ | 15 | /* This is the value for an Origin kernel, taken from an IRIX kernel. */ |
16 | /* . = 0xc00000000001c000; */ | 16 | /* . = 0xc00000000001c000; */ |
17 | 17 | ||
18 | /* Set the vaddr for the text segment to a value | 18 | /* Set the vaddr for the text segment to a value |
19 | >= 0xa800 0000 0001 9000 if no symmon is going to configured | 19 | >= 0xa800 0000 0001 9000 if no symmon is going to configured |
20 | >= 0xa800 0000 0030 0000 otherwise */ | 20 | >= 0xa800 0000 0030 0000 otherwise */ |
21 | 21 | ||
diff --git a/arch/mips/lasat/at93c.c b/arch/mips/lasat/at93c.c index f6add041ebec..ca26e554615e 100644 --- a/arch/mips/lasat/at93c.c +++ b/arch/mips/lasat/at93c.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Atmel AT93C46 serial eeprom driver | 2 | * Atmel AT93C46 serial eeprom driver |
3 | * | 3 | * |
4 | * Brian Murphy <brian.murphy@eicon.com> | 4 | * Brian Murphy <brian.murphy@eicon.com> |
5 | * | 5 | * |
6 | */ | 6 | */ |
7 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
@@ -21,12 +21,12 @@ | |||
21 | 21 | ||
22 | struct at93c_defs *at93c; | 22 | struct at93c_defs *at93c; |
23 | 23 | ||
24 | static void at93c_reg_write(u32 val) | 24 | static void at93c_reg_write(u32 val) |
25 | { | 25 | { |
26 | *at93c->reg = val; | 26 | *at93c->reg = val; |
27 | } | 27 | } |
28 | 28 | ||
29 | static u32 at93c_reg_read(void) | 29 | static u32 at93c_reg_read(void) |
30 | { | 30 | { |
31 | u32 tmp = *at93c->reg; | 31 | u32 tmp = *at93c->reg; |
32 | return tmp; | 32 | return tmp; |
@@ -81,7 +81,7 @@ static u8 at93c_read_byte(void) | |||
81 | } | 81 | } |
82 | 82 | ||
83 | static void at93c_write_bits(u32 data, int size) | 83 | static void at93c_write_bits(u32 data, int size) |
84 | { | 84 | { |
85 | int i; | 85 | int i; |
86 | int shift = size - 1; | 86 | int shift = size - 1; |
87 | u32 mask = (1 << shift); | 87 | u32 mask = (1 << shift); |
@@ -90,7 +90,7 @@ static void at93c_write_bits(u32 data, int size) | |||
90 | at93c_write_databit((data & mask) >> shift); | 90 | at93c_write_databit((data & mask) >> shift); |
91 | data <<= 1; | 91 | data <<= 1; |
92 | } | 92 | } |
93 | } | 93 | } |
94 | 94 | ||
95 | static void at93c_init_op(void) | 95 | static void at93c_init_op(void) |
96 | { | 96 | { |
@@ -104,8 +104,8 @@ static void at93c_end_op(void) | |||
104 | lasat_ndelay(250); | 104 | lasat_ndelay(250); |
105 | } | 105 | } |
106 | 106 | ||
107 | static void at93c_wait(void) | 107 | static void at93c_wait(void) |
108 | { | 108 | { |
109 | at93c_init_op(); | 109 | at93c_init_op(); |
110 | while (!at93c_read_databit()) | 110 | while (!at93c_read_databit()) |
111 | ; | 111 | ; |
diff --git a/arch/mips/lasat/at93c.h b/arch/mips/lasat/at93c.h index a912ac2171b0..cfe2f99b1d44 100644 --- a/arch/mips/lasat/at93c.h +++ b/arch/mips/lasat/at93c.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Atmel AT93C46 serial eeprom driver | 2 | * Atmel AT93C46 serial eeprom driver |
3 | * | 3 | * |
4 | * Brian Murphy <brian.murphy@eicon.com> | 4 | * Brian Murphy <brian.murphy@eicon.com> |
5 | * | 5 | * |
6 | */ | 6 | */ |
7 | 7 | ||
diff --git a/arch/mips/lasat/ds1603.c b/arch/mips/lasat/ds1603.c index 7bbf6cf923c9..9d7812e03dcd 100644 --- a/arch/mips/lasat/ds1603.c +++ b/arch/mips/lasat/ds1603.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Dallas Semiconductors 1603 RTC driver | 2 | * Dallas Semiconductors 1603 RTC driver |
3 | * | 3 | * |
4 | * Brian Murphy <brian@murphy.dk> | 4 | * Brian Murphy <brian@murphy.dk> |
5 | * | 5 | * |
6 | */ | 6 | */ |
7 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
@@ -20,12 +20,12 @@ | |||
20 | struct ds_defs *ds1603 = NULL; | 20 | struct ds_defs *ds1603 = NULL; |
21 | 21 | ||
22 | /* HW specific register functions */ | 22 | /* HW specific register functions */ |
23 | static void rtc_reg_write(unsigned long val) | 23 | static void rtc_reg_write(unsigned long val) |
24 | { | 24 | { |
25 | *ds1603->reg = val; | 25 | *ds1603->reg = val; |
26 | } | 26 | } |
27 | 27 | ||
28 | static unsigned long rtc_reg_read(void) | 28 | static unsigned long rtc_reg_read(void) |
29 | { | 29 | { |
30 | unsigned long tmp = *ds1603->reg; | 30 | unsigned long tmp = *ds1603->reg; |
31 | return tmp; | 31 | return tmp; |
@@ -80,7 +80,7 @@ static unsigned int rtc_read_databit(void) | |||
80 | { | 80 | { |
81 | unsigned int data; | 81 | unsigned int data; |
82 | 82 | ||
83 | data = (rtc_datareg_read() & (1 << ds1603->data_read_shift)) | 83 | data = (rtc_datareg_read() & (1 << ds1603->data_read_shift)) |
84 | >> ds1603->data_read_shift; | 84 | >> ds1603->data_read_shift; |
85 | rtc_cycle_clock(rtc_reg_read()); | 85 | rtc_cycle_clock(rtc_reg_read()); |
86 | return data; | 86 | return data; |
diff --git a/arch/mips/lasat/ds1603.h b/arch/mips/lasat/ds1603.h index 55f3b0423c20..c2e5c76a379d 100644 --- a/arch/mips/lasat/ds1603.h +++ b/arch/mips/lasat/ds1603.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Dallas Semiconductors 1603 RTC driver | 2 | * Dallas Semiconductors 1603 RTC driver |
3 | * | 3 | * |
4 | * Brian Murphy <brian@murphy.dk> | 4 | * Brian Murphy <brian@murphy.dk> |
5 | * | 5 | * |
6 | */ | 6 | */ |
7 | #ifndef __DS1603_H | 7 | #ifndef __DS1603_H |
diff --git a/arch/mips/lasat/image/Makefile b/arch/mips/lasat/image/Makefile index 18b6430f11be..35ecd6483ef6 100644 --- a/arch/mips/lasat/image/Makefile +++ b/arch/mips/lasat/image/Makefile | |||
@@ -21,7 +21,7 @@ LDSCRIPT= -L$(obj) -Tromscript.normal | |||
21 | HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \ | 21 | HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \ |
22 | -D_kernel_entry=0x$(KERNEL_ENTRY) \ | 22 | -D_kernel_entry=0x$(KERNEL_ENTRY) \ |
23 | -D VERSION="\"$(Version)\"" \ | 23 | -D VERSION="\"$(Version)\"" \ |
24 | -D TIMESTAMP=$(shell date +%s) | 24 | -D TIMESTAMP=$(shell date +%s) |
25 | 25 | ||
26 | $(obj)/head.o: $(obj)/head.S $(KERNEL_IMAGE) | 26 | $(obj)/head.o: $(obj)/head.S $(KERNEL_IMAGE) |
27 | $(CC) -fno-pic $(HEAD_DEFINES) -I$(TOPDIR)/include -c -o $@ $< | 27 | $(CC) -fno-pic $(HEAD_DEFINES) -I$(TOPDIR)/include -c -o $@ $< |
diff --git a/arch/mips/lasat/image/head.S b/arch/mips/lasat/image/head.S index 426bd7de17bb..efb95f2609c2 100644 --- a/arch/mips/lasat/image/head.S +++ b/arch/mips/lasat/image/head.S | |||
@@ -27,5 +27,5 @@ reldate: | |||
27 | .word TIMESTAMP | 27 | .word TIMESTAMP |
28 | 28 | ||
29 | .org 0x50 | 29 | .org 0x50 |
30 | release: | 30 | release: |
31 | .string VERSION | 31 | .string VERSION |
diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c index 1148a2d20aa7..c90da1639440 100644 --- a/arch/mips/lasat/interrupt.c +++ b/arch/mips/lasat/interrupt.c | |||
@@ -15,7 +15,7 @@ | |||
15 | * with this program; if not, write to the Free Software Foundation, Inc., | 15 | * with this program; if not, write to the Free Software Foundation, Inc., |
16 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. | 16 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. |
17 | * | 17 | * |
18 | * Routines for generic manipulation of the interrupts found on the | 18 | * Routines for generic manipulation of the interrupts found on the |
19 | * Lasat boards. | 19 | * Lasat boards. |
20 | */ | 20 | */ |
21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
@@ -101,7 +101,7 @@ static unsigned long get_int_status_100(void) | |||
101 | return *lasat_int_status & *lasat_int_mask; | 101 | return *lasat_int_status & *lasat_int_mask; |
102 | } | 102 | } |
103 | 103 | ||
104 | static unsigned long get_int_status_200(void) | 104 | static unsigned long get_int_status_200(void) |
105 | { | 105 | { |
106 | unsigned long int_status; | 106 | unsigned long int_status; |
107 | 107 | ||
diff --git a/arch/mips/lasat/lasat_board.c b/arch/mips/lasat/lasat_board.c index 8c784bcf1111..fc9b0e2a6be1 100644 --- a/arch/mips/lasat/lasat_board.c +++ b/arch/mips/lasat/lasat_board.c | |||
@@ -67,7 +67,7 @@ static void init_flash_sizes(void) | |||
67 | 67 | ||
68 | if (mips_machtype == MACH_LASAT_100) { | 68 | if (mips_machtype == MACH_LASAT_100) { |
69 | lasat_board_info.li_flash_base = 0x1e000000; | 69 | lasat_board_info.li_flash_base = 0x1e000000; |
70 | 70 | ||
71 | lb[LASAT_MTD_BOOTLOADER] = 0x1e400000; | 71 | lb[LASAT_MTD_BOOTLOADER] = 0x1e400000; |
72 | 72 | ||
73 | if (lasat_board_info.li_flash_size > 0x200000) { | 73 | if (lasat_board_info.li_flash_size > 0x200000) { |
@@ -103,7 +103,7 @@ int lasat_init_board_info(void) | |||
103 | memset(&lasat_board_info, 0, sizeof(lasat_board_info)); | 103 | memset(&lasat_board_info, 0, sizeof(lasat_board_info)); |
104 | 104 | ||
105 | /* First read the EEPROM info */ | 105 | /* First read the EEPROM info */ |
106 | EEPROMRead(0, (unsigned char *)&lasat_board_info.li_eeprom_info, | 106 | EEPROMRead(0, (unsigned char *)&lasat_board_info.li_eeprom_info, |
107 | sizeof(struct lasat_eeprom_struct)); | 107 | sizeof(struct lasat_eeprom_struct)); |
108 | 108 | ||
109 | /* Check the CRC */ | 109 | /* Check the CRC */ |
@@ -188,7 +188,7 @@ int lasat_init_board_info(void) | |||
188 | case 0x1: | 188 | case 0x1: |
189 | lasat_board_info.li_cpu_hz = | 189 | lasat_board_info.li_cpu_hz = |
190 | lasat_board_info.li_bus_hz + | 190 | lasat_board_info.li_bus_hz + |
191 | (lasat_board_info.li_bus_hz >> 1); | 191 | (lasat_board_info.li_bus_hz >> 1); |
192 | break; | 192 | break; |
193 | case 0x2: | 193 | case 0x2: |
194 | lasat_board_info.li_cpu_hz = | 194 | lasat_board_info.li_cpu_hz = |
@@ -271,7 +271,7 @@ void lasat_write_eeprom_info(void) | |||
271 | lasat_board_info.li_eeprom_info.crc32 = crc; | 271 | lasat_board_info.li_eeprom_info.crc32 = crc; |
272 | 272 | ||
273 | /* Write the EEPROM info */ | 273 | /* Write the EEPROM info */ |
274 | EEPROMWrite(0, (unsigned char *)&lasat_board_info.li_eeprom_info, | 274 | EEPROMWrite(0, (unsigned char *)&lasat_board_info.li_eeprom_info, |
275 | sizeof(struct lasat_eeprom_struct)); | 275 | sizeof(struct lasat_eeprom_struct)); |
276 | } | 276 | } |
277 | 277 | ||
diff --git a/arch/mips/lasat/picvue.c b/arch/mips/lasat/picvue.c index 5637cd153926..9ae82c3ffb07 100644 --- a/arch/mips/lasat/picvue.c +++ b/arch/mips/lasat/picvue.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Picvue PVC160206 display driver | 2 | * Picvue PVC160206 display driver |
3 | * | 3 | * |
4 | * Brian Murphy <brian@murphy.dk> | 4 | * Brian Murphy <brian@murphy.dk> |
5 | * | 5 | * |
6 | */ | 6 | */ |
7 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
@@ -24,12 +24,12 @@ struct pvc_defs *picvue = NULL; | |||
24 | 24 | ||
25 | DECLARE_MUTEX(pvc_sem); | 25 | DECLARE_MUTEX(pvc_sem); |
26 | 26 | ||
27 | static void pvc_reg_write(u32 val) | 27 | static void pvc_reg_write(u32 val) |
28 | { | 28 | { |
29 | *picvue->reg = val; | 29 | *picvue->reg = val; |
30 | } | 30 | } |
31 | 31 | ||
32 | static u32 pvc_reg_read(void) | 32 | static u32 pvc_reg_read(void) |
33 | { | 33 | { |
34 | u32 tmp = *picvue->reg; | 34 | u32 tmp = *picvue->reg; |
35 | return tmp; | 35 | return tmp; |
@@ -65,12 +65,12 @@ static u8 pvc_read_data(void) | |||
65 | { | 65 | { |
66 | u32 data = pvc_reg_read(); | 66 | u32 data = pvc_reg_read(); |
67 | u8 byte; | 67 | u8 byte; |
68 | data |= picvue->rw; | 68 | data |= picvue->rw; |
69 | data &= ~picvue->rs; | 69 | data &= ~picvue->rs; |
70 | pvc_reg_write(data); | 70 | pvc_reg_write(data); |
71 | ndelay(40); | 71 | ndelay(40); |
72 | byte = pvc_read_byte(data); | 72 | byte = pvc_read_byte(data); |
73 | data |= picvue->rs; | 73 | data |= picvue->rs; |
74 | pvc_reg_write(data); | 74 | pvc_reg_write(data); |
75 | return byte; | 75 | return byte; |
76 | } | 76 | } |
diff --git a/arch/mips/lasat/picvue.h b/arch/mips/lasat/picvue.h index 74a39039135d..2a96bf971897 100644 --- a/arch/mips/lasat/picvue.h +++ b/arch/mips/lasat/picvue.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Picvue PVC160206 display driver | 2 | * Picvue PVC160206 display driver |
3 | * | 3 | * |
4 | * Brian Murphy <brian.murphy@eicon.com> | 4 | * Brian Murphy <brian.murphy@eicon.com> |
5 | * | 5 | * |
6 | */ | 6 | */ |
7 | #include <asm/semaphore.h> | 7 | #include <asm/semaphore.h> |
diff --git a/arch/mips/lasat/picvue_proc.c b/arch/mips/lasat/picvue_proc.c index eaa2b4625124..cce7cddcdb08 100644 --- a/arch/mips/lasat/picvue_proc.c +++ b/arch/mips/lasat/picvue_proc.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Picvue PVC160206 display driver | 2 | * Picvue PVC160206 display driver |
3 | * | 3 | * |
4 | * Brian Murphy <brian.murphy@eicon.com> | 4 | * Brian Murphy <brian.murphy@eicon.com> |
5 | * | 5 | * |
6 | */ | 6 | */ |
7 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
@@ -51,10 +51,10 @@ static int pvc_proc_read_line(char *page, char **start, | |||
51 | page += sprintf(page, "%s\n", pvc_lines[lineno]); | 51 | page += sprintf(page, "%s\n", pvc_lines[lineno]); |
52 | up(&pvc_sem); | 52 | up(&pvc_sem); |
53 | 53 | ||
54 | return page - origpage; | 54 | return page - origpage; |
55 | } | 55 | } |
56 | 56 | ||
57 | static int pvc_proc_write_line(struct file *file, const char *buffer, | 57 | static int pvc_proc_write_line(struct file *file, const char *buffer, |
58 | unsigned long count, void *data) | 58 | unsigned long count, void *data) |
59 | { | 59 | { |
60 | int origcount = count; | 60 | int origcount = count; |
@@ -119,7 +119,7 @@ static int pvc_proc_read_scroll(char *page, char **start, | |||
119 | page += sprintf(page, "%d\n", scroll_dir * scroll_interval); | 119 | page += sprintf(page, "%d\n", scroll_dir * scroll_interval); |
120 | up(&pvc_sem); | 120 | up(&pvc_sem); |
121 | 121 | ||
122 | return page - origpage; | 122 | return page - origpage; |
123 | } | 123 | } |
124 | 124 | ||
125 | 125 | ||
diff --git a/arch/mips/lasat/prom.c b/arch/mips/lasat/prom.c index ca62881c9e52..88c7ab871ec4 100644 --- a/arch/mips/lasat/prom.c +++ b/arch/mips/lasat/prom.c | |||
@@ -42,7 +42,7 @@ static void null_prom_putc(char c) | |||
42 | /* these are functions provided by the bootloader */ | 42 | /* these are functions provided by the bootloader */ |
43 | static void (* prom_putc)(char c) = null_prom_putc; | 43 | static void (* prom_putc)(char c) = null_prom_putc; |
44 | void (* prom_printf)(const char * fmt, ...) = null_prom_printf; | 44 | void (* prom_printf)(const char * fmt, ...) = null_prom_printf; |
45 | void (* prom_display)(const char *string, int pos, int clear) = | 45 | void (* prom_display)(const char *string, int pos, int clear) = |
46 | null_prom_display; | 46 | null_prom_display; |
47 | void (* prom_monitor)(void) = null_prom_monitor; | 47 | void (* prom_monitor)(void) = null_prom_monitor; |
48 | 48 | ||
diff --git a/arch/mips/lasat/reset.c b/arch/mips/lasat/reset.c index 37e4912ee1c8..8d7d7a454f9a 100644 --- a/arch/mips/lasat/reset.c +++ b/arch/mips/lasat/reset.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Thomas Horsten <thh@lasat.com> | 2 | * Thomas Horsten <thh@lasat.com> |
3 | * Copyright (C) 2000 LASAT Networks A/S. | 3 | * Copyright (C) 2000 LASAT Networks A/S. |
4 | * | 4 | * |
diff --git a/arch/mips/lasat/setup.c b/arch/mips/lasat/setup.c index e371ed5cbe34..f2604fab9a99 100644 --- a/arch/mips/lasat/setup.c +++ b/arch/mips/lasat/setup.c | |||
@@ -105,7 +105,7 @@ static int lasat_panic_prom_monitor(struct notifier_block *this, | |||
105 | return NOTIFY_DONE; | 105 | return NOTIFY_DONE; |
106 | } | 106 | } |
107 | 107 | ||
108 | static struct notifier_block lasat_panic_block[] = | 108 | static struct notifier_block lasat_panic_block[] = |
109 | { | 109 | { |
110 | { lasat_panic_display, NULL, INT_MAX }, | 110 | { lasat_panic_display, NULL, INT_MAX }, |
111 | { lasat_panic_prom_monitor, NULL, INT_MIN } | 111 | { lasat_panic_prom_monitor, NULL, INT_MIN } |
@@ -120,7 +120,7 @@ static void lasat_timer_setup(struct irqaction *irq) | |||
120 | { | 120 | { |
121 | 121 | ||
122 | write_c0_compare( | 122 | write_c0_compare( |
123 | read_c0_count() + | 123 | read_c0_count() + |
124 | mips_hpt_frequency / HZ); | 124 | mips_hpt_frequency / HZ); |
125 | change_c0_status(ST0_IM, IE_IRQ0 | IE_IRQ5); | 125 | change_c0_status(ST0_IM, IE_IRQ0 | IE_IRQ5); |
126 | } | 126 | } |
diff --git a/arch/mips/lasat/sysctl.c b/arch/mips/lasat/sysctl.c index 1c0cc620a43f..8ff43a1c1e99 100644 --- a/arch/mips/lasat/sysctl.c +++ b/arch/mips/lasat/sysctl.c | |||
@@ -37,14 +37,14 @@ | |||
37 | 37 | ||
38 | static DECLARE_MUTEX(lasat_info_sem); | 38 | static DECLARE_MUTEX(lasat_info_sem); |
39 | 39 | ||
40 | /* Strategy function to write EEPROM after changing string entry */ | 40 | /* Strategy function to write EEPROM after changing string entry */ |
41 | int sysctl_lasatstring(ctl_table *table, int *name, int nlen, | 41 | int sysctl_lasatstring(ctl_table *table, int *name, int nlen, |
42 | void *oldval, size_t *oldlenp, | 42 | void *oldval, size_t *oldlenp, |
43 | void *newval, size_t newlen, void **context) | 43 | void *newval, size_t newlen, void **context) |
44 | { | 44 | { |
45 | int r; | 45 | int r; |
46 | down(&lasat_info_sem); | 46 | down(&lasat_info_sem); |
47 | r = sysctl_string(table, name, | 47 | r = sysctl_string(table, name, |
48 | nlen, oldval, oldlenp, newval, newlen, context); | 48 | nlen, oldval, oldlenp, newval, newlen, context); |
49 | if (r < 0) { | 49 | if (r < 0) { |
50 | up(&lasat_info_sem); | 50 | up(&lasat_info_sem); |
@@ -74,7 +74,7 @@ int proc_dolasatstring(ctl_table *table, int write, struct file *filp, | |||
74 | return 0; | 74 | return 0; |
75 | } | 75 | } |
76 | 76 | ||
77 | /* proc function to write EEPROM after changing int entry */ | 77 | /* proc function to write EEPROM after changing int entry */ |
78 | int proc_dolasatint(ctl_table *table, int write, struct file *filp, | 78 | int proc_dolasatint(ctl_table *table, int write, struct file *filp, |
79 | void *buffer, size_t *lenp, loff_t *ppos) | 79 | void *buffer, size_t *lenp, loff_t *ppos) |
80 | { | 80 | { |
@@ -93,7 +93,7 @@ int proc_dolasatint(ctl_table *table, int write, struct file *filp, | |||
93 | static int rtctmp; | 93 | static int rtctmp; |
94 | 94 | ||
95 | #ifdef CONFIG_DS1603 | 95 | #ifdef CONFIG_DS1603 |
96 | /* proc function to read/write RealTime Clock */ | 96 | /* proc function to read/write RealTime Clock */ |
97 | int proc_dolasatrtc(ctl_table *table, int write, struct file *filp, | 97 | int proc_dolasatrtc(ctl_table *table, int write, struct file *filp, |
98 | void *buffer, size_t *lenp, loff_t *ppos) | 98 | void *buffer, size_t *lenp, loff_t *ppos) |
99 | { | 99 | { |
@@ -165,9 +165,9 @@ static char lasat_bcastaddr[16]; | |||
165 | void update_bcastaddr(void) | 165 | void update_bcastaddr(void) |
166 | { | 166 | { |
167 | unsigned int ip; | 167 | unsigned int ip; |
168 | 168 | ||
169 | ip = (lasat_board_info.li_eeprom_info.ipaddr & | 169 | ip = (lasat_board_info.li_eeprom_info.ipaddr & |
170 | lasat_board_info.li_eeprom_info.netmask) | | 170 | lasat_board_info.li_eeprom_info.netmask) | |
171 | ~lasat_board_info.li_eeprom_info.netmask; | 171 | ~lasat_board_info.li_eeprom_info.netmask; |
172 | 172 | ||
173 | sprintf(lasat_bcastaddr, "%d.%d.%d.%d", | 173 | sprintf(lasat_bcastaddr, "%d.%d.%d.%d", |
@@ -205,7 +205,7 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp, | |||
205 | break; | 205 | break; |
206 | len++; | 206 | len++; |
207 | } | 207 | } |
208 | if (len >= sizeof(proc_lasat_ipbuf)-1) | 208 | if (len >= sizeof(proc_lasat_ipbuf)-1) |
209 | len = sizeof(proc_lasat_ipbuf) - 1; | 209 | len = sizeof(proc_lasat_ipbuf) - 1; |
210 | if (copy_from_user(proc_lasat_ipbuf, buffer, len)) | 210 | if (copy_from_user(proc_lasat_ipbuf, buffer, len)) |
211 | { | 211 | { |
@@ -249,8 +249,8 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp, | |||
249 | } | 249 | } |
250 | #endif /* defined(CONFIG_INET) */ | 250 | #endif /* defined(CONFIG_INET) */ |
251 | 251 | ||
252 | static int sysctl_lasat_eeprom_value(ctl_table *table, int *name, int nlen, | 252 | static int sysctl_lasat_eeprom_value(ctl_table *table, int *name, int nlen, |
253 | void *oldval, size_t *oldlenp, | 253 | void *oldval, size_t *oldlenp, |
254 | void *newval, size_t newlen, | 254 | void *newval, size_t newlen, |
255 | void **context) | 255 | void **context) |
256 | { | 256 | { |
@@ -293,7 +293,7 @@ int proc_lasat_eeprom_value(ctl_table *table, int write, struct file *filp, | |||
293 | if (!strcmp(filp->f_dentry->d_name.name, "debugaccess")) | 293 | if (!strcmp(filp->f_dentry->d_name.name, "debugaccess")) |
294 | lasat_board_info.li_eeprom_info.debugaccess = lasat_board_info.li_debugaccess; | 294 | lasat_board_info.li_eeprom_info.debugaccess = lasat_board_info.li_debugaccess; |
295 | } | 295 | } |
296 | lasat_write_eeprom_info(); | 296 | lasat_write_eeprom_info(); |
297 | up(&lasat_info_sem); | 297 | up(&lasat_info_sem); |
298 | return 0; | 298 | return 0; |
299 | } | 299 | } |
@@ -316,8 +316,8 @@ static ctl_table lasat_table[] = { | |||
316 | 0644, NULL, &proc_lasat_ip, &sysctl_lasat_intvec}, | 316 | 0644, NULL, &proc_lasat_ip, &sysctl_lasat_intvec}, |
317 | {LASAT_NETMASK, "netmask", &lasat_board_info.li_eeprom_info.netmask, sizeof(int), | 317 | {LASAT_NETMASK, "netmask", &lasat_board_info.li_eeprom_info.netmask, sizeof(int), |
318 | 0644, NULL, &proc_lasat_ip, &sysctl_lasat_intvec}, | 318 | 0644, NULL, &proc_lasat_ip, &sysctl_lasat_intvec}, |
319 | {LASAT_BCAST, "bcastaddr", &lasat_bcastaddr, | 319 | {LASAT_BCAST, "bcastaddr", &lasat_bcastaddr, |
320 | sizeof(lasat_bcastaddr), 0600, NULL, | 320 | sizeof(lasat_bcastaddr), 0600, NULL, |
321 | &proc_dostring, &sysctl_string}, | 321 | &proc_dostring, &sysctl_string}, |
322 | #endif | 322 | #endif |
323 | {LASAT_PASSWORD, "passwd_hash", &lasat_board_info.li_eeprom_info.passwd_hash, sizeof(lasat_board_info.li_eeprom_info.passwd_hash), | 323 | {LASAT_PASSWORD, "passwd_hash", &lasat_board_info.li_eeprom_info.passwd_hash, sizeof(lasat_board_info.li_eeprom_info.passwd_hash), |
diff --git a/arch/mips/lib-32/Makefile b/arch/mips/lib-32/Makefile index fd6a2bafdfcf..ad285786e74b 100644 --- a/arch/mips/lib-32/Makefile +++ b/arch/mips/lib-32/Makefile | |||
@@ -2,7 +2,7 @@ | |||
2 | # Makefile for MIPS-specific library files.. | 2 | # Makefile for MIPS-specific library files.. |
3 | # | 3 | # |
4 | 4 | ||
5 | lib-y += csum_partial.o memset.o watch.o | 5 | lib-y += csum_partial.o memset.o watch.o |
6 | 6 | ||
7 | obj-$(CONFIG_CPU_MIPS32) += dump_tlb.o | 7 | obj-$(CONFIG_CPU_MIPS32) += dump_tlb.o |
8 | obj-$(CONFIG_CPU_MIPS64) += dump_tlb.o | 8 | obj-$(CONFIG_CPU_MIPS64) += dump_tlb.o |
diff --git a/arch/mips/lib-64/Makefile b/arch/mips/lib-64/Makefile index fd6a2bafdfcf..ad285786e74b 100644 --- a/arch/mips/lib-64/Makefile +++ b/arch/mips/lib-64/Makefile | |||
@@ -2,7 +2,7 @@ | |||
2 | # Makefile for MIPS-specific library files.. | 2 | # Makefile for MIPS-specific library files.. |
3 | # | 3 | # |
4 | 4 | ||
5 | lib-y += csum_partial.o memset.o watch.o | 5 | lib-y += csum_partial.o memset.o watch.o |
6 | 6 | ||
7 | obj-$(CONFIG_CPU_MIPS32) += dump_tlb.o | 7 | obj-$(CONFIG_CPU_MIPS32) += dump_tlb.o |
8 | obj-$(CONFIG_CPU_MIPS64) += dump_tlb.o | 8 | obj-$(CONFIG_CPU_MIPS64) += dump_tlb.o |
diff --git a/arch/mips/lib/memcpy.S b/arch/mips/lib/memcpy.S index 00d73be7dc27..90ee8d43261f 100644 --- a/arch/mips/lib/memcpy.S +++ b/arch/mips/lib/memcpy.S | |||
@@ -101,7 +101,7 @@ | |||
101 | #define NBYTES 8 | 101 | #define NBYTES 8 |
102 | #define LOG_NBYTES 3 | 102 | #define LOG_NBYTES 3 |
103 | 103 | ||
104 | /* | 104 | /* |
105 | * As we are sharing code base with the mips32 tree (which use the o32 ABI | 105 | * As we are sharing code base with the mips32 tree (which use the o32 ABI |
106 | * register definitions). We need to redefine the register definitions from | 106 | * register definitions). We need to redefine the register definitions from |
107 | * the n64 ABI register naming to the o32 ABI register naming. | 107 | * the n64 ABI register naming to the o32 ABI register naming. |
@@ -118,7 +118,7 @@ | |||
118 | #define t5 $13 | 118 | #define t5 $13 |
119 | #define t6 $14 | 119 | #define t6 $14 |
120 | #define t7 $15 | 120 | #define t7 $15 |
121 | 121 | ||
122 | #else | 122 | #else |
123 | 123 | ||
124 | #define LOAD lw | 124 | #define LOAD lw |
diff --git a/arch/mips/mips-boards/atlas/atlas_int.c b/arch/mips/mips-boards/atlas/atlas_int.c index 8f1d875217a2..19d4b0792460 100644 --- a/arch/mips/mips-boards/atlas/atlas_int.c +++ b/arch/mips/mips-boards/atlas/atlas_int.c | |||
@@ -122,7 +122,7 @@ void __init arch_init_irq(void) | |||
122 | int i; | 122 | int i; |
123 | 123 | ||
124 | atlas_hw0_icregs = (struct atlas_ictrl_regs *)ioremap (ATLAS_ICTRL_REGS_BASE, sizeof(struct atlas_ictrl_regs *)); | 124 | atlas_hw0_icregs = (struct atlas_ictrl_regs *)ioremap (ATLAS_ICTRL_REGS_BASE, sizeof(struct atlas_ictrl_regs *)); |
125 | 125 | ||
126 | /* | 126 | /* |
127 | * Mask out all interrupt by writing "1" to all bit position in | 127 | * Mask out all interrupt by writing "1" to all bit position in |
128 | * the interrupt reset reg. | 128 | * the interrupt reset reg. |
diff --git a/arch/mips/mips-boards/generic/init.c b/arch/mips/mips-boards/generic/init.c index 31caf0603a3f..311155d1d3ed 100644 --- a/arch/mips/mips-boards/generic/init.c +++ b/arch/mips/mips-boards/generic/init.c | |||
@@ -200,7 +200,7 @@ void __init kgdb_config (void) | |||
200 | generic_putDebugChar = saa9730_putDebugChar; | 200 | generic_putDebugChar = saa9730_putDebugChar; |
201 | generic_getDebugChar = saa9730_getDebugChar; | 201 | generic_getDebugChar = saa9730_getDebugChar; |
202 | } | 202 | } |
203 | else | 203 | else |
204 | #endif | 204 | #endif |
205 | { | 205 | { |
206 | speed = rs_kgdb_hook(line, speed); | 206 | speed = rs_kgdb_hook(line, speed); |
@@ -243,7 +243,7 @@ void __init prom_init(void) | |||
243 | mips_revision_corid = MIPS_REVISION_CORID; | 243 | mips_revision_corid = MIPS_REVISION_CORID; |
244 | 244 | ||
245 | if (mips_revision_corid == MIPS_REVISION_CORID_CORE_EMUL) { | 245 | if (mips_revision_corid == MIPS_REVISION_CORID_CORE_EMUL) { |
246 | if (BONITO_PCIDID == 0x0001df53 || | 246 | if (BONITO_PCIDID == 0x0001df53 || |
247 | BONITO_PCIDID == 0x0003df53) | 247 | BONITO_PCIDID == 0x0003df53) |
248 | mips_revision_corid = MIPS_REVISION_CORID_CORE_EMUL_BON; | 248 | mips_revision_corid = MIPS_REVISION_CORID_CORE_EMUL_BON; |
249 | else | 249 | else |
@@ -310,7 +310,7 @@ void __init prom_init(void) | |||
310 | case MIPS_REVISION_CORID_CORE_MSC: | 310 | case MIPS_REVISION_CORID_CORE_MSC: |
311 | case MIPS_REVISION_CORID_CORE_FPGA2: | 311 | case MIPS_REVISION_CORID_CORE_FPGA2: |
312 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: | 312 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: |
313 | _pcictrl_msc = (unsigned long)ioremap(MIPS_MSC01_PCI_REG_BASE, 0x2000); | 313 | _pcictrl_msc = (unsigned long)ioremap(MIPS_MSC01_PCI_REG_BASE, 0x2000); |
314 | 314 | ||
315 | #ifdef CONFIG_CPU_LITTLE_ENDIAN | 315 | #ifdef CONFIG_CPU_LITTLE_ENDIAN |
316 | MSC_WRITE(MSC01_PCI_SWAP, MSC01_PCI_SWAP_NOSWAP); | 316 | MSC_WRITE(MSC01_PCI_SWAP, MSC01_PCI_SWAP_NOSWAP); |
diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mips-boards/generic/time.c index fe7fc17305a6..16315444dd5a 100644 --- a/arch/mips/mips-boards/generic/time.c +++ b/arch/mips/mips-boards/generic/time.c | |||
@@ -89,7 +89,7 @@ static unsigned int __init estimate_cpu_frequency(void) | |||
89 | * really calculate the timer frequency | 89 | * really calculate the timer frequency |
90 | * For now we hardwire the SEAD board frequency to 12MHz. | 90 | * For now we hardwire the SEAD board frequency to 12MHz. |
91 | */ | 91 | */ |
92 | 92 | ||
93 | if ((prid == (PRID_COMP_MIPS | PRID_IMP_20KC)) || | 93 | if ((prid == (PRID_COMP_MIPS | PRID_IMP_20KC)) || |
94 | (prid == (PRID_COMP_MIPS | PRID_IMP_25KF))) | 94 | (prid == (PRID_COMP_MIPS | PRID_IMP_25KF))) |
95 | count = 12000000; | 95 | count = 12000000; |
diff --git a/arch/mips/mips-boards/malta/malta_setup.c b/arch/mips/mips-boards/malta/malta_setup.c index 3377e66de9eb..df6db6419ae9 100644 --- a/arch/mips/mips-boards/malta/malta_setup.c +++ b/arch/mips/mips-boards/malta/malta_setup.c | |||
@@ -149,15 +149,15 @@ static int __init malta_setup(void) | |||
149 | argptr = prom_getcmdline(); | 149 | argptr = prom_getcmdline(); |
150 | if (strstr(argptr, "iobcuncached")) { | 150 | if (strstr(argptr, "iobcuncached")) { |
151 | BONITO_PCICACHECTRL &= ~BONITO_PCICACHECTRL_IOBCCOH_EN; | 151 | BONITO_PCICACHECTRL &= ~BONITO_PCICACHECTRL_IOBCCOH_EN; |
152 | BONITO_PCIMEMBASECFG = BONITO_PCIMEMBASECFG & | 152 | BONITO_PCIMEMBASECFG = BONITO_PCIMEMBASECFG & |
153 | ~(BONITO_PCIMEMBASECFG_MEMBASE0_CACHED | | 153 | ~(BONITO_PCIMEMBASECFG_MEMBASE0_CACHED | |
154 | BONITO_PCIMEMBASECFG_MEMBASE1_CACHED); | 154 | BONITO_PCIMEMBASECFG_MEMBASE1_CACHED); |
155 | printk("Disabled Bonito IOBC coherency\n"); | 155 | printk("Disabled Bonito IOBC coherency\n"); |
156 | } | 156 | } |
157 | else { | 157 | else { |
158 | BONITO_PCICACHECTRL |= BONITO_PCICACHECTRL_IOBCCOH_EN; | 158 | BONITO_PCICACHECTRL |= BONITO_PCICACHECTRL_IOBCCOH_EN; |
159 | BONITO_PCIMEMBASECFG |= | 159 | BONITO_PCIMEMBASECFG |= |
160 | (BONITO_PCIMEMBASECFG_MEMBASE0_CACHED | | 160 | (BONITO_PCIMEMBASECFG_MEMBASE0_CACHED | |
161 | BONITO_PCIMEMBASECFG_MEMBASE1_CACHED); | 161 | BONITO_PCIMEMBASECFG_MEMBASE1_CACHED); |
162 | printk("Disabled Bonito IOBC coherency\n"); | 162 | printk("Disabled Bonito IOBC coherency\n"); |
163 | } | 163 | } |
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c index 20d40725e5bb..5ea84bc98c6a 100644 --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c | |||
@@ -126,13 +126,13 @@ static inline void tx49_blast_icache32(void) | |||
126 | 126 | ||
127 | CACHE32_UNROLL32_ALIGN2; | 127 | CACHE32_UNROLL32_ALIGN2; |
128 | /* I'm in even chunk. blast odd chunks */ | 128 | /* I'm in even chunk. blast odd chunks */ |
129 | for (ws = 0; ws < ws_end; ws += ws_inc) | 129 | for (ws = 0; ws < ws_end; ws += ws_inc) |
130 | for (addr = start + 0x400; addr < end; addr += 0x400 * 2) | 130 | for (addr = start + 0x400; addr < end; addr += 0x400 * 2) |
131 | cache32_unroll32(addr|ws,Index_Invalidate_I); | 131 | cache32_unroll32(addr|ws,Index_Invalidate_I); |
132 | CACHE32_UNROLL32_ALIGN; | 132 | CACHE32_UNROLL32_ALIGN; |
133 | /* I'm in odd chunk. blast even chunks */ | 133 | /* I'm in odd chunk. blast even chunks */ |
134 | for (ws = 0; ws < ws_end; ws += ws_inc) | 134 | for (ws = 0; ws < ws_end; ws += ws_inc) |
135 | for (addr = start; addr < end; addr += 0x400 * 2) | 135 | for (addr = start; addr < end; addr += 0x400 * 2) |
136 | cache32_unroll32(addr|ws,Index_Invalidate_I); | 136 | cache32_unroll32(addr|ws,Index_Invalidate_I); |
137 | } | 137 | } |
138 | 138 | ||
@@ -156,13 +156,13 @@ static inline void tx49_blast_icache32_page_indexed(unsigned long page) | |||
156 | 156 | ||
157 | CACHE32_UNROLL32_ALIGN2; | 157 | CACHE32_UNROLL32_ALIGN2; |
158 | /* I'm in even chunk. blast odd chunks */ | 158 | /* I'm in even chunk. blast odd chunks */ |
159 | for (ws = 0; ws < ws_end; ws += ws_inc) | 159 | for (ws = 0; ws < ws_end; ws += ws_inc) |
160 | for (addr = start + 0x400; addr < end; addr += 0x400 * 2) | 160 | for (addr = start + 0x400; addr < end; addr += 0x400 * 2) |
161 | cache32_unroll32(addr|ws,Index_Invalidate_I); | 161 | cache32_unroll32(addr|ws,Index_Invalidate_I); |
162 | CACHE32_UNROLL32_ALIGN; | 162 | CACHE32_UNROLL32_ALIGN; |
163 | /* I'm in odd chunk. blast even chunks */ | 163 | /* I'm in odd chunk. blast even chunks */ |
164 | for (ws = 0; ws < ws_end; ws += ws_inc) | 164 | for (ws = 0; ws < ws_end; ws += ws_inc) |
165 | for (addr = start; addr < end; addr += 0x400 * 2) | 165 | for (addr = start; addr < end; addr += 0x400 * 2) |
166 | cache32_unroll32(addr|ws,Index_Invalidate_I); | 166 | cache32_unroll32(addr|ws,Index_Invalidate_I); |
167 | } | 167 | } |
168 | 168 | ||
diff --git a/arch/mips/mm/c-sb1.c b/arch/mips/mm/c-sb1.c index ab30afd63b32..502f68c664b2 100644 --- a/arch/mips/mm/c-sb1.c +++ b/arch/mips/mm/c-sb1.c | |||
@@ -270,7 +270,7 @@ static void local_sb1_flush_icache_range(unsigned long start, | |||
270 | __sb1_writeback_inv_dcache_all(); | 270 | __sb1_writeback_inv_dcache_all(); |
271 | else | 271 | else |
272 | __sb1_writeback_inv_dcache_range(start, end); | 272 | __sb1_writeback_inv_dcache_range(start, end); |
273 | 273 | ||
274 | /* Just flush the whole icache if the range is big enough */ | 274 | /* Just flush the whole icache if the range is big enough */ |
275 | if ((end - start) > icache_range_cutoff) | 275 | if ((end - start) > icache_range_cutoff) |
276 | __sb1_flush_icache_all(); | 276 | __sb1_flush_icache_all(); |
diff --git a/arch/mips/mm/cerr-sb1.c b/arch/mips/mm/cerr-sb1.c index 13d96d62764e..7166ffe63502 100644 --- a/arch/mips/mm/cerr-sb1.c +++ b/arch/mips/mm/cerr-sb1.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <asm/sibyte/sb1250_regs.h> | 25 | #include <asm/sibyte/sb1250_regs.h> |
26 | #include <asm/sibyte/sb1250_scd.h> | 26 | #include <asm/sibyte/sb1250_scd.h> |
27 | #endif | 27 | #endif |
28 | 28 | ||
29 | /* SB1 definitions */ | 29 | /* SB1 definitions */ |
30 | 30 | ||
31 | /* XXX should come from config1 XXX */ | 31 | /* XXX should come from config1 XXX */ |
@@ -136,14 +136,14 @@ static inline void breakout_cerrd(unsigned int val) | |||
136 | 136 | ||
137 | #ifndef CONFIG_SIBYTE_BUS_WATCHER | 137 | #ifndef CONFIG_SIBYTE_BUS_WATCHER |
138 | 138 | ||
139 | static void check_bus_watcher(void) | 139 | static void check_bus_watcher(void) |
140 | { | 140 | { |
141 | uint32_t status, l2_err, memio_err; | 141 | uint32_t status, l2_err, memio_err; |
142 | 142 | ||
143 | /* Destructive read, clears register and interrupt */ | 143 | /* Destructive read, clears register and interrupt */ |
144 | status = csr_in32(IOADDR(A_SCD_BUS_ERR_STATUS)); | 144 | status = csr_in32(IOADDR(A_SCD_BUS_ERR_STATUS)); |
145 | /* Bit 31 is always on, but there's no #define for that */ | 145 | /* Bit 31 is always on, but there's no #define for that */ |
146 | if (status & ~(1UL << 31)) { | 146 | if (status & ~(1UL << 31)) { |
147 | l2_err = csr_in32(IOADDR(A_BUS_L2_ERRORS)); | 147 | l2_err = csr_in32(IOADDR(A_BUS_L2_ERRORS)); |
148 | memio_err = csr_in32(IOADDR(A_BUS_MEM_IO_ERRORS)); | 148 | memio_err = csr_in32(IOADDR(A_BUS_MEM_IO_ERRORS)); |
149 | prom_printf("Bus watcher error counters: %08x %08x\n", l2_err, memio_err); | 149 | prom_printf("Bus watcher error counters: %08x %08x\n", l2_err, memio_err); |
@@ -153,14 +153,14 @@ static void check_bus_watcher(void) | |||
153 | (int)(G_SCD_BERR_TID(status) >> 6), | 153 | (int)(G_SCD_BERR_TID(status) >> 6), |
154 | (int)G_SCD_BERR_RID(status), | 154 | (int)G_SCD_BERR_RID(status), |
155 | (int)G_SCD_BERR_DCODE(status)); | 155 | (int)G_SCD_BERR_DCODE(status)); |
156 | } else { | 156 | } else { |
157 | prom_printf("Bus watcher indicates no error\n"); | 157 | prom_printf("Bus watcher indicates no error\n"); |
158 | } | 158 | } |
159 | } | 159 | } |
160 | #else | 160 | #else |
161 | extern void check_bus_watcher(void); | 161 | extern void check_bus_watcher(void); |
162 | #endif | 162 | #endif |
163 | 163 | ||
164 | asmlinkage void sb1_cache_error(void) | 164 | asmlinkage void sb1_cache_error(void) |
165 | { | 165 | { |
166 | uint64_t cerr_dpa; | 166 | uint64_t cerr_dpa; |
diff --git a/arch/mips/mm/dma-noncoherent.c b/arch/mips/mm/dma-noncoherent.c index 9895e32b0fce..59e54f12212e 100644 --- a/arch/mips/mm/dma-noncoherent.c +++ b/arch/mips/mm/dma-noncoherent.c | |||
@@ -162,7 +162,7 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, | |||
162 | 162 | ||
163 | for (i = 0; i < nents; i++, sg++) { | 163 | for (i = 0; i < nents; i++, sg++) { |
164 | unsigned long addr; | 164 | unsigned long addr; |
165 | 165 | ||
166 | addr = (unsigned long) page_address(sg->page); | 166 | addr = (unsigned long) page_address(sg->page); |
167 | if (addr) | 167 | if (addr) |
168 | __dma_sync(addr + sg->offset, sg->length, direction); | 168 | __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, | |||
230 | size_t size, enum dma_data_direction direction) | 230 | size_t size, enum dma_data_direction direction) |
231 | { | 231 | { |
232 | unsigned long addr; | 232 | unsigned long addr; |
233 | 233 | ||
234 | BUG_ON(direction == DMA_NONE); | 234 | BUG_ON(direction == DMA_NONE); |
235 | 235 | ||
236 | addr = dma_handle + PAGE_OFFSET; | 236 | addr = dma_handle + PAGE_OFFSET; |
237 | __dma_sync(addr, size, direction); | 237 | __dma_sync(addr, size, direction); |
238 | } | 238 | } |
@@ -282,9 +282,9 @@ void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems, | |||
282 | enum dma_data_direction direction) | 282 | enum dma_data_direction direction) |
283 | { | 283 | { |
284 | int i; | 284 | int i; |
285 | 285 | ||
286 | BUG_ON(direction == DMA_NONE); | 286 | BUG_ON(direction == DMA_NONE); |
287 | 287 | ||
288 | /* Make sure that gcc doesn't leave the empty loop body. */ | 288 | /* Make sure that gcc doesn't leave the empty loop body. */ |
289 | for (i = 0; i < nelems; i++, sg++) | 289 | for (i = 0; i < nelems; i++, sg++) |
290 | __dma_sync((unsigned long)page_address(sg->page), | 290 | __dma_sync((unsigned long)page_address(sg->page), |
diff --git a/arch/mips/mm/pg-sb1.c b/arch/mips/mm/pg-sb1.c index b63e1ca350f5..1b6df7133c1e 100644 --- a/arch/mips/mm/pg-sb1.c +++ b/arch/mips/mm/pg-sb1.c | |||
@@ -198,7 +198,7 @@ static inline void copy_page_cpu(void *to, void *from) | |||
198 | 198 | ||
199 | /* | 199 | /* |
200 | * Pad descriptors to cacheline, since each is exclusively owned by a | 200 | * Pad descriptors to cacheline, since each is exclusively owned by a |
201 | * particular CPU. | 201 | * particular CPU. |
202 | */ | 202 | */ |
203 | typedef struct dmadscr_s { | 203 | typedef struct dmadscr_s { |
204 | u64 dscr_a; | 204 | u64 dscr_a; |
diff --git a/arch/mips/momentum/jaguar_atx/int-handler.S b/arch/mips/momentum/jaguar_atx/int-handler.S index 43fd5a58077c..55bc789733f2 100644 --- a/arch/mips/momentum/jaguar_atx/int-handler.S +++ b/arch/mips/momentum/jaguar_atx/int-handler.S | |||
@@ -27,11 +27,11 @@ | |||
27 | SAVE_ALL | 27 | SAVE_ALL |
28 | CLI | 28 | CLI |
29 | .set at | 29 | .set at |
30 | mfc0 t0, CP0_CAUSE | 30 | mfc0 t0, CP0_CAUSE |
31 | mfc0 t2, CP0_STATUS | 31 | mfc0 t2, CP0_STATUS |
32 | 32 | ||
33 | and t0, t2 | 33 | and t0, t2 |
34 | 34 | ||
35 | andi t1, t0, STATUSF_IP0 /* sw0 software interrupt */ | 35 | andi t1, t0, STATUSF_IP0 /* sw0 software interrupt */ |
36 | bnez t1, ll_sw0_irq | 36 | bnez t1, ll_sw0_irq |
37 | andi t1, t0, STATUSF_IP1 /* sw1 software interrupt */ | 37 | andi t1, t0, STATUSF_IP1 /* sw1 software interrupt */ |
@@ -103,25 +103,25 @@ ll_pcia_irq: | |||
103 | move a1, sp | 103 | move a1, sp |
104 | jal do_IRQ | 104 | jal do_IRQ |
105 | j ret_from_irq | 105 | j ret_from_irq |
106 | 106 | ||
107 | ll_pcib_irq: | 107 | ll_pcib_irq: |
108 | li a0, 5 | 108 | li a0, 5 |
109 | move a1, sp | 109 | move a1, sp |
110 | jal do_IRQ | 110 | jal do_IRQ |
111 | j ret_from_irq | 111 | j ret_from_irq |
112 | 112 | ||
113 | ll_uart_irq: | 113 | ll_uart_irq: |
114 | li a0, 6 | 114 | li a0, 6 |
115 | move a1, sp | 115 | move a1, sp |
116 | jal do_IRQ | 116 | jal do_IRQ |
117 | j ret_from_irq | 117 | j ret_from_irq |
118 | 118 | ||
119 | ll_cputimer_irq: | 119 | ll_cputimer_irq: |
120 | li a0, 7 | 120 | li a0, 7 |
121 | move a1, sp | 121 | move a1, sp |
122 | jal ll_timer_interrupt | 122 | jal ll_timer_interrupt |
123 | j ret_from_irq | 123 | j ret_from_irq |
124 | 124 | ||
125 | ll_mv64340_decode_irq: | 125 | ll_mv64340_decode_irq: |
126 | move a0, sp | 126 | move a0, sp |
127 | jal ll_mv64340_irq | 127 | jal ll_mv64340_irq |
diff --git a/arch/mips/momentum/jaguar_atx/prom.c b/arch/mips/momentum/jaguar_atx/prom.c index 827960802b8f..14ae2e713585 100644 --- a/arch/mips/momentum/jaguar_atx/prom.c +++ b/arch/mips/momentum/jaguar_atx/prom.c | |||
@@ -64,7 +64,7 @@ static u8 exchange_bit(u8 val, u8 cs) | |||
64 | 64 | ||
65 | /* turn the clock off and read-strobe */ | 65 | /* turn the clock off and read-strobe */ |
66 | JAGUAR_FPGA_WRITE((val << 2) | cs | 0x10, EEPROM_MODE); | 66 | JAGUAR_FPGA_WRITE((val << 2) | cs | 0x10, EEPROM_MODE); |
67 | 67 | ||
68 | /* return the data */ | 68 | /* return the data */ |
69 | return ((JAGUAR_FPGA_READ(EEPROM_MODE) >> 3) & 0x1); | 69 | return ((JAGUAR_FPGA_READ(EEPROM_MODE) >> 3) & 0x1); |
70 | } | 70 | } |
diff --git a/arch/mips/momentum/jaguar_atx/setup.c b/arch/mips/momentum/jaguar_atx/setup.c index 3cf1e46aa4b8..90288cf2b1e0 100644 --- a/arch/mips/momentum/jaguar_atx/setup.c +++ b/arch/mips/momentum/jaguar_atx/setup.c | |||
@@ -451,7 +451,7 @@ static int __init momenco_jaguar_atx_setup(void) | |||
451 | #ifdef GEMDEBUG_TRACEBUFFER | 451 | #ifdef GEMDEBUG_TRACEBUFFER |
452 | { | 452 | { |
453 | unsigned int tbControl; | 453 | unsigned int tbControl; |
454 | tbControl = | 454 | tbControl = |
455 | 0 << 26 | /* post trigger delay 0 */ | 455 | 0 << 26 | /* post trigger delay 0 */ |
456 | 0x2 << 16 | /* sequential trace mode */ | 456 | 0x2 << 16 | /* sequential trace mode */ |
457 | // 0x0 << 16 | /* non-sequential trace mode */ | 457 | // 0x0 << 16 | /* non-sequential trace mode */ |
diff --git a/arch/mips/momentum/ocelot_c/int-handler.S b/arch/mips/momentum/ocelot_c/int-handler.S index 2f2430648abc..52349d9bf1be 100644 --- a/arch/mips/momentum/ocelot_c/int-handler.S +++ b/arch/mips/momentum/ocelot_c/int-handler.S | |||
@@ -27,11 +27,11 @@ | |||
27 | SAVE_ALL | 27 | SAVE_ALL |
28 | CLI | 28 | CLI |
29 | .set at | 29 | .set at |
30 | mfc0 t0, CP0_CAUSE | 30 | mfc0 t0, CP0_CAUSE |
31 | mfc0 t2, CP0_STATUS | 31 | mfc0 t2, CP0_STATUS |
32 | 32 | ||
33 | and t0, t2 | 33 | and t0, t2 |
34 | 34 | ||
35 | andi t1, t0, STATUSF_IP0 /* sw0 software interrupt */ | 35 | andi t1, t0, STATUSF_IP0 /* sw0 software interrupt */ |
36 | bnez t1, ll_sw0_irq | 36 | bnez t1, ll_sw0_irq |
37 | andi t1, t0, STATUSF_IP1 /* sw1 software interrupt */ | 37 | andi t1, t0, STATUSF_IP1 /* sw1 software interrupt */ |
@@ -83,7 +83,7 @@ ll_pmc_irq: | |||
83 | move a1, sp | 83 | move a1, sp |
84 | jal do_IRQ | 84 | jal do_IRQ |
85 | j ret_from_irq | 85 | j ret_from_irq |
86 | 86 | ||
87 | ll_cpci_decode_irq: | 87 | ll_cpci_decode_irq: |
88 | move a0, sp | 88 | move a0, sp |
89 | jal ll_cpci_irq | 89 | jal ll_cpci_irq |
@@ -99,4 +99,4 @@ ll_cputimer_irq: | |||
99 | move a1, sp | 99 | move a1, sp |
100 | jal do_IRQ | 100 | jal do_IRQ |
101 | j ret_from_irq | 101 | j ret_from_irq |
102 | 102 | ||
diff --git a/arch/mips/momentum/ocelot_c/prom.c b/arch/mips/momentum/ocelot_c/prom.c index 375877aebcf6..5b6809724b15 100644 --- a/arch/mips/momentum/ocelot_c/prom.c +++ b/arch/mips/momentum/ocelot_c/prom.c | |||
@@ -67,7 +67,7 @@ static u8 exchange_bit(u8 val, u8 cs) | |||
67 | 67 | ||
68 | /* turn the clock off and read-strobe */ | 68 | /* turn the clock off and read-strobe */ |
69 | OCELOT_FPGA_WRITE((val << 2) | cs | 0x10, EEPROM_MODE); | 69 | OCELOT_FPGA_WRITE((val << 2) | cs | 0x10, EEPROM_MODE); |
70 | 70 | ||
71 | /* return the data */ | 71 | /* return the data */ |
72 | return ((OCELOT_FPGA_READ(EEPROM_MODE) >> 3) & 0x1); | 72 | return ((OCELOT_FPGA_READ(EEPROM_MODE) >> 3) & 0x1); |
73 | } | 73 | } |
diff --git a/arch/mips/pci/fixup-ddb5074.c b/arch/mips/pci/fixup-ddb5074.c index b345e528a53c..5a4a7c239c42 100644 --- a/arch/mips/pci/fixup-ddb5074.c +++ b/arch/mips/pci/fixup-ddb5074.c | |||
@@ -5,7 +5,7 @@ static void ddb5074_fixup(struct pci_dev *dev) | |||
5 | { | 5 | { |
6 | extern struct pci_dev *pci_pmu; | 6 | extern struct pci_dev *pci_pmu; |
7 | u8 t8; | 7 | u8 t8; |
8 | 8 | ||
9 | pci_pmu = dev; /* for LEDs D2 and D3 */ | 9 | pci_pmu = dev; /* for LEDs D2 and D3 */ |
10 | /* Program the lines for LEDs D2 and D3 to output */ | 10 | /* Program the lines for LEDs D2 and D3 to output */ |
11 | pci_read_config_byte(dev, 0x7d, &t8); | 11 | pci_read_config_byte(dev, 0x7d, &t8); |
diff --git a/arch/mips/pci/fixup-ddb5477.c b/arch/mips/pci/fixup-ddb5477.c index 6abdc88bab1e..2f1444e60654 100644 --- a/arch/mips/pci/fixup-ddb5477.c +++ b/arch/mips/pci/fixup-ddb5477.c | |||
@@ -65,7 +65,7 @@ static void ddb5477_amd_lance_fixup(struct pci_dev *dev) | |||
65 | ioaddr = pci_resource_start(dev, 0); | 65 | ioaddr = pci_resource_start(dev, 0); |
66 | 66 | ||
67 | inw(ioaddr + PCNET32_WIO_RESET); /* reset chip */ | 67 | inw(ioaddr + PCNET32_WIO_RESET); /* reset chip */ |
68 | 68 | ||
69 | /* bcr_18 |= 0x0800 */ | 69 | /* bcr_18 |= 0x0800 */ |
70 | outw(18, ioaddr + PCNET32_WIO_RAP); | 70 | outw(18, ioaddr + PCNET32_WIO_RAP); |
71 | temp = inw(ioaddr + PCNET32_WIO_BDP); | 71 | temp = inw(ioaddr + PCNET32_WIO_BDP); |
diff --git a/arch/mips/pci/fixup-malta.c b/arch/mips/pci/fixup-malta.c index b9296d9942b3..bf2c41d1e9c5 100644 --- a/arch/mips/pci/fixup-malta.c +++ b/arch/mips/pci/fixup-malta.c | |||
@@ -56,7 +56,7 @@ static void __init malta_piix_func0_fixup(struct pci_dev *pdev) | |||
56 | 0, 0, 0, 3, | 56 | 0, 0, 0, 3, |
57 | 4, 5, 6, 7, | 57 | 4, 5, 6, 7, |
58 | 0, 9, 10, 11, | 58 | 0, 9, 10, 11, |
59 | 12, 0, 14, 15 | 59 | 12, 0, 14, 15 |
60 | }; | 60 | }; |
61 | int i; | 61 | int i; |
62 | 62 | ||
diff --git a/arch/mips/pci/fixup-rbtx4927.c b/arch/mips/pci/fixup-rbtx4927.c index de4e443da208..ceeb1860895a 100644 --- a/arch/mips/pci/fixup-rbtx4927.c +++ b/arch/mips/pci/fixup-rbtx4927.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * Author: MontaVista Software, Inc. | 7 | * Author: MontaVista Software, Inc. |
8 | * ppopov@mvista.com or source@mvista.com | 8 | * ppopov@mvista.com or source@mvista.com |
9 | * | 9 | * |
10 | * Copyright (C) 2000-2001 Toshiba Corporation | 10 | * Copyright (C) 2000-2001 Toshiba Corporation |
11 | * | 11 | * |
12 | * Copyright (C) 2004 MontaVista Software Inc. | 12 | * Copyright (C) 2004 MontaVista Software Inc. |
13 | * Author: Manish Lachwani (mlachwani@mvista.com) | 13 | * Author: Manish Lachwani (mlachwani@mvista.com) |
diff --git a/arch/mips/pci/fixup-sni.c b/arch/mips/pci/fixup-sni.c index c8ef01a017cc..a176f2ca8656 100644 --- a/arch/mips/pci/fixup-sni.c +++ b/arch/mips/pci/fixup-sni.c | |||
@@ -32,7 +32,7 @@ | |||
32 | * Device 4: Unused | 32 | * Device 4: Unused |
33 | * Device 5: Slot 2 | 33 | * Device 5: Slot 2 |
34 | * Device 6: Slot 3 | 34 | * Device 6: Slot 3 |
35 | * Device 7: Slot 4 | 35 | * Device 7: Slot 4 |
36 | * | 36 | * |
37 | * Documentation says the VGA is device 5 and device 3 is unused but that | 37 | * Documentation says the VGA is device 5 and device 3 is unused but that |
38 | * seem to be a documentation error. At least on my RM200C the Cirrus | 38 | * seem to be a documentation error. At least on my RM200C the Cirrus |
diff --git a/arch/mips/pci/ops-ddb5477.c b/arch/mips/pci/ops-ddb5477.c index e955443fedf9..0406b50a37d8 100644 --- a/arch/mips/pci/ops-ddb5477.c +++ b/arch/mips/pci/ops-ddb5477.c | |||
@@ -127,7 +127,7 @@ static inline void ddb_close_config_base(struct pci_config_swap *swap) | |||
127 | } | 127 | } |
128 | 128 | ||
129 | static int read_config_dword(struct pci_config_swap *swap, | 129 | static int read_config_dword(struct pci_config_swap *swap, |
130 | struct pci_bus *bus, u32 devfn, u32 where, | 130 | struct pci_bus *bus, u32 devfn, u32 where, |
131 | u32 * val) | 131 | u32 * val) |
132 | { | 132 | { |
133 | u32 bus_num, slot_num, func_num; | 133 | u32 bus_num, slot_num, func_num; |
@@ -153,7 +153,7 @@ static int read_config_dword(struct pci_config_swap *swap, | |||
153 | } | 153 | } |
154 | 154 | ||
155 | static int read_config_word(struct pci_config_swap *swap, | 155 | static int read_config_word(struct pci_config_swap *swap, |
156 | struct pci_bus *bus, u32 devfn, u32 where, | 156 | struct pci_bus *bus, u32 devfn, u32 where, |
157 | u16 * val) | 157 | u16 * val) |
158 | { | 158 | { |
159 | int status; | 159 | int status; |
diff --git a/arch/mips/pci/ops-tx4927.c b/arch/mips/pci/ops-tx4927.c index 2a9d7227fe87..7688b7711329 100644 --- a/arch/mips/pci/ops-tx4927.c +++ b/arch/mips/pci/ops-tx4927.c | |||
@@ -1,16 +1,16 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright 2001 MontaVista Software Inc. | 2 | * Copyright 2001 MontaVista Software Inc. |
3 | * Author: MontaVista Software, Inc. | 3 | * Author: MontaVista Software, Inc. |
4 | * ahennessy@mvista.com | 4 | * ahennessy@mvista.com |
5 | * | 5 | * |
6 | * Copyright (C) 2000-2001 Toshiba Corporation | 6 | * Copyright (C) 2000-2001 Toshiba Corporation |
7 | * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org) | 7 | * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org) |
8 | * | 8 | * |
9 | * Based on arch/mips/ddb5xxx/ddb5477/pci_ops.c | 9 | * Based on arch/mips/ddb5xxx/ddb5477/pci_ops.c |
10 | * | 10 | * |
11 | * Define the pci_ops for the Toshiba rbtx4927 | 11 | * Define the pci_ops for the Toshiba rbtx4927 |
12 | * | 12 | * |
13 | * Much of the code is derived from the original DDB5074 port by | 13 | * Much of the code is derived from the original DDB5074 port by |
14 | * Geert Uytterhoeven <geert@sonycom.com> | 14 | * Geert Uytterhoeven <geert@sonycom.com> |
15 | * | 15 | * |
16 | * Copyright 2004 MontaVista Software Inc. | 16 | * Copyright 2004 MontaVista Software Inc. |
diff --git a/arch/mips/pci/pci-ddb5477.c b/arch/mips/pci/pci-ddb5477.c index 4ddd53eaf656..826d653184e5 100644 --- a/arch/mips/pci/pci-ddb5477.c +++ b/arch/mips/pci/pci-ddb5477.c | |||
@@ -76,7 +76,7 @@ struct pci_controller ddb5477_io_controller = { | |||
76 | */ | 76 | */ |
77 | 77 | ||
78 | /* | 78 | /* |
79 | * irq mapping : device -> pci int # -> vrc4377 irq# , | 79 | * irq mapping : device -> pci int # -> vrc4377 irq# , |
80 | * ddb5477 board manual page 4 and vrc5477 manual page 46 | 80 | * ddb5477 board manual page 4 and vrc5477 manual page 46 |
81 | */ | 81 | */ |
82 | 82 | ||
@@ -137,9 +137,9 @@ int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | |||
137 | unsigned char *slot_irq_map; | 137 | unsigned char *slot_irq_map; |
138 | unsigned char irq; | 138 | unsigned char irq; |
139 | 139 | ||
140 | /* | 140 | /* |
141 | * We ignore the swizzled slot and pin values. The original | 141 | * We ignore the swizzled slot and pin values. The original |
142 | * pci_fixup_irq() codes largely base irq number on the dev slot | 142 | * pci_fixup_irq() codes largely base irq number on the dev slot |
143 | * numbers because except for one case they are unique even | 143 | * numbers because except for one case they are unique even |
144 | * though there are multiple pci buses. | 144 | * though there are multiple pci buses. |
145 | */ | 145 | */ |
@@ -160,7 +160,7 @@ int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | |||
160 | 160 | ||
161 | if (mips_machtype == MACH_NEC_ROCKHOPPERII) { | 161 | if (mips_machtype == MACH_NEC_ROCKHOPPERII) { |
162 | /* hack to distinquish overlapping slot 20s, one | 162 | /* hack to distinquish overlapping slot 20s, one |
163 | * on bus 0 (ALI USB on the M1535 on the backplane), | 163 | * on bus 0 (ALI USB on the M1535 on the backplane), |
164 | * and one on bus 2 (NEC USB controller on the CPU board) | 164 | * and one on bus 2 (NEC USB controller on the CPU board) |
165 | * Make the M1535 USB - ISA IRQ number 9. | 165 | * Make the M1535 USB - ISA IRQ number 9. |
166 | */ | 166 | */ |
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c index 8141dffac241..8a5b52250bda 100644 --- a/arch/mips/pci/pci.c +++ b/arch/mips/pci/pci.c | |||
@@ -132,7 +132,7 @@ static int __init pcibios_init(void) | |||
132 | hose->need_domain_info = need_domain_info; | 132 | hose->need_domain_info = need_domain_info; |
133 | next_busno = bus->subordinate + 1; | 133 | next_busno = bus->subordinate + 1; |
134 | /* Don't allow 8-bit bus number overflow inside the hose - | 134 | /* Don't allow 8-bit bus number overflow inside the hose - |
135 | reserve some space for bridges. */ | 135 | reserve some space for bridges. */ |
136 | if (next_busno > 224) { | 136 | if (next_busno > 224) { |
137 | next_busno = 0; | 137 | next_busno = 0; |
138 | need_domain_info = 1; | 138 | need_domain_info = 1; |
@@ -260,7 +260,7 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus) | |||
260 | (dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) { | 260 | (dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) { |
261 | pci_read_bridge_bases(bus); | 261 | pci_read_bridge_bases(bus); |
262 | pcibios_fixup_device_resources(dev, bus); | 262 | pcibios_fixup_device_resources(dev, bus); |
263 | } | 263 | } |
264 | 264 | ||
265 | for (ln = bus->devices.next; ln != &bus->devices; ln = ln->next) { | 265 | for (ln = bus->devices.next; ln != &bus->devices; ln = ln->next) { |
266 | struct pci_dev *dev = pci_dev_b(ln); | 266 | struct pci_dev *dev = pci_dev_b(ln); |
diff --git a/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c b/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c index b067988614c3..97862f45496d 100644 --- a/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c +++ b/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c | |||
@@ -30,7 +30,7 @@ | |||
30 | * | 30 | * |
31 | * This code reads the ATMEL 24CXX EEPROM. The PMC-Sierra Yosemite board uses the ATMEL | 31 | * This code reads the ATMEL 24CXX EEPROM. The PMC-Sierra Yosemite board uses the ATMEL |
32 | * 24C32/24C64 which uses two byte addressing as compared to 24C16. Note that this program | 32 | * 24C32/24C64 which uses two byte addressing as compared to 24C16. Note that this program |
33 | * uses the serial port like /dev/ttyS0, to communicate with the EEPROM. Hence, you are | 33 | * uses the serial port like /dev/ttyS0, to communicate with the EEPROM. Hence, you are |
34 | * expected to have a connectivity from the EEPROM to the serial port. This program does | 34 | * expected to have a connectivity from the EEPROM to the serial port. This program does |
35 | * __not__ communicate using the I2C protocol | 35 | * __not__ communicate using the I2C protocol |
36 | */ | 36 | */ |
@@ -64,14 +64,14 @@ static void send_ack(void) | |||
64 | static void send_byte(unsigned char byte) | 64 | static void send_byte(unsigned char byte) |
65 | { | 65 | { |
66 | int i = 0; | 66 | int i = 0; |
67 | 67 | ||
68 | for (i = 7; i >= 0; i--) | 68 | for (i = 7; i >= 0; i--) |
69 | send_bit((byte >> i) & 0x01); | 69 | send_bit((byte >> i) & 0x01); |
70 | } | 70 | } |
71 | 71 | ||
72 | static void send_start(void) | 72 | static void send_start(void) |
73 | { | 73 | { |
74 | sda_hi; | 74 | sda_hi; |
75 | delay(TXX); | 75 | delay(TXX); |
76 | scl_hi; | 76 | scl_hi; |
77 | delay(TXX); | 77 | delay(TXX); |
@@ -114,9 +114,9 @@ static unsigned char recv_byte(void) { | |||
114 | int i; | 114 | int i; |
115 | unsigned char byte=0; | 115 | unsigned char byte=0; |
116 | 116 | ||
117 | for (i=7;i>=0;i--) | 117 | for (i=7;i>=0;i--) |
118 | byte |= (recv_bit() << i); | 118 | byte |= (recv_bit() << i); |
119 | 119 | ||
120 | return byte; | 120 | return byte; |
121 | } | 121 | } |
122 | 122 | ||
diff --git a/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.h b/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.h index d27566d99ffc..c19f01a32045 100644 --- a/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.h +++ b/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.h | |||
@@ -27,7 +27,7 @@ | |||
27 | */ | 27 | */ |
28 | 28 | ||
29 | /* | 29 | /* |
30 | * Header file for atmel_read_eeprom.c | 30 | * Header file for atmel_read_eeprom.c |
31 | */ | 31 | */ |
32 | 32 | ||
33 | #include <linux/types.h> | 33 | #include <linux/types.h> |
@@ -46,7 +46,7 @@ | |||
46 | #define DEFAULT_PORT "/dev/ttyS0" /* Port to open */ | 46 | #define DEFAULT_PORT "/dev/ttyS0" /* Port to open */ |
47 | #define TXX 0 /* Dummy loop for spinning */ | 47 | #define TXX 0 /* Dummy loop for spinning */ |
48 | 48 | ||
49 | #define BLOCK_SEL 0x00 | 49 | #define BLOCK_SEL 0x00 |
50 | #define SLAVE_ADDR 0xa0 | 50 | #define SLAVE_ADDR 0xa0 |
51 | #define READ_BIT 0x01 | 51 | #define READ_BIT 0x01 |
52 | #define WRITE_BIT 0x00 | 52 | #define WRITE_BIT 0x00 |
diff --git a/arch/mips/sgi-ip22/ip22-eisa.c b/arch/mips/sgi-ip22/ip22-eisa.c index 0ab4abf65d58..fa0e719c5bd1 100644 --- a/arch/mips/sgi-ip22/ip22-eisa.c +++ b/arch/mips/sgi-ip22/ip22-eisa.c | |||
@@ -242,7 +242,7 @@ int __init ip22_eisa_init(void) | |||
242 | int i, c; | 242 | int i, c; |
243 | char *str; | 243 | char *str; |
244 | u8 *slot_addr; | 244 | u8 *slot_addr; |
245 | 245 | ||
246 | if (!(sgimc->systemid & SGIMC_SYSID_EPRESENT)) { | 246 | if (!(sgimc->systemid & SGIMC_SYSID_EPRESENT)) { |
247 | printk(KERN_INFO "EISA: bus not present.\n"); | 247 | printk(KERN_INFO "EISA: bus not present.\n"); |
248 | return 1; | 248 | return 1; |
diff --git a/arch/mips/sgi-ip22/ip22-hpc.c b/arch/mips/sgi-ip22/ip22-hpc.c index c0afeccb08c4..5c00cdd20d8e 100644 --- a/arch/mips/sgi-ip22/ip22-hpc.c +++ b/arch/mips/sgi-ip22/ip22-hpc.c | |||
@@ -49,7 +49,7 @@ void __init sgihpc_init(void) | |||
49 | sgint = &sgioc->int3; | 49 | sgint = &sgioc->int3; |
50 | system_type = "SGI Indy"; | 50 | system_type = "SGI Indy"; |
51 | } | 51 | } |
52 | 52 | ||
53 | sgi_ioc_reset = (SGIOC_RESET_PPORT | SGIOC_RESET_KBDMOUSE | | 53 | sgi_ioc_reset = (SGIOC_RESET_PPORT | SGIOC_RESET_KBDMOUSE | |
54 | SGIOC_RESET_EISA | SGIOC_RESET_ISDN | | 54 | SGIOC_RESET_EISA | SGIOC_RESET_ISDN | |
55 | SGIOC_RESET_LC0OFF); | 55 | SGIOC_RESET_LC0OFF); |
diff --git a/arch/mips/sgi-ip22/ip22-int.c b/arch/mips/sgi-ip22/ip22-int.c index ea2844d29e6e..d16fb43b1a93 100644 --- a/arch/mips/sgi-ip22/ip22-int.c +++ b/arch/mips/sgi-ip22/ip22-int.c | |||
@@ -28,7 +28,7 @@ | |||
28 | /* #define DEBUG_SGINT */ | 28 | /* #define DEBUG_SGINT */ |
29 | 29 | ||
30 | /* So far nothing hangs here */ | 30 | /* So far nothing hangs here */ |
31 | #undef USE_LIO3_IRQ | 31 | #undef USE_LIO3_IRQ |
32 | 32 | ||
33 | struct sgint_regs *sgint; | 33 | struct sgint_regs *sgint; |
34 | 34 | ||
@@ -272,32 +272,32 @@ void indy_buserror_irq(struct pt_regs *regs) | |||
272 | irq_exit(); | 272 | irq_exit(); |
273 | } | 273 | } |
274 | 274 | ||
275 | static struct irqaction local0_cascade = { | 275 | static struct irqaction local0_cascade = { |
276 | .handler = no_action, | 276 | .handler = no_action, |
277 | .flags = SA_INTERRUPT, | 277 | .flags = SA_INTERRUPT, |
278 | .name = "local0 cascade", | 278 | .name = "local0 cascade", |
279 | }; | 279 | }; |
280 | 280 | ||
281 | static struct irqaction local1_cascade = { | 281 | static struct irqaction local1_cascade = { |
282 | .handler = no_action, | 282 | .handler = no_action, |
283 | .flags = SA_INTERRUPT, | 283 | .flags = SA_INTERRUPT, |
284 | .name = "local1 cascade", | 284 | .name = "local1 cascade", |
285 | }; | 285 | }; |
286 | 286 | ||
287 | static struct irqaction buserr = { | 287 | static struct irqaction buserr = { |
288 | .handler = no_action, | 288 | .handler = no_action, |
289 | .flags = SA_INTERRUPT, | 289 | .flags = SA_INTERRUPT, |
290 | .name = "Bus Error", | 290 | .name = "Bus Error", |
291 | }; | 291 | }; |
292 | 292 | ||
293 | static struct irqaction map0_cascade = { | 293 | static struct irqaction map0_cascade = { |
294 | .handler = no_action, | 294 | .handler = no_action, |
295 | .flags = SA_INTERRUPT, | 295 | .flags = SA_INTERRUPT, |
296 | .name = "mapable0 cascade", | 296 | .name = "mapable0 cascade", |
297 | }; | 297 | }; |
298 | 298 | ||
299 | #ifdef USE_LIO3_IRQ | 299 | #ifdef USE_LIO3_IRQ |
300 | static struct irqaction map1_cascade = { | 300 | static struct irqaction map1_cascade = { |
301 | .handler = no_action, | 301 | .handler = no_action, |
302 | .flags = SA_INTERRUPT, | 302 | .flags = SA_INTERRUPT, |
303 | .name = "mapable1 cascade", | 303 | .name = "mapable1 cascade", |
diff --git a/arch/mips/sgi-ip22/ip22-nvram.c b/arch/mips/sgi-ip22/ip22-nvram.c index de43e86fa17c..fd29fd407ae8 100644 --- a/arch/mips/sgi-ip22/ip22-nvram.c +++ b/arch/mips/sgi-ip22/ip22-nvram.c | |||
@@ -39,7 +39,7 @@ | |||
39 | *ptr |= EEPROM_CSEL; \ | 39 | *ptr |= EEPROM_CSEL; \ |
40 | *ptr |= EEPROM_ECLK; }) | 40 | *ptr |= EEPROM_ECLK; }) |
41 | 41 | ||
42 | 42 | ||
43 | #define eeprom_cs_off(ptr) ({ \ | 43 | #define eeprom_cs_off(ptr) ({ \ |
44 | *ptr &= ~EEPROM_ECLK; \ | 44 | *ptr &= ~EEPROM_ECLK; \ |
45 | *ptr &= ~EEPROM_CSEL; \ | 45 | *ptr &= ~EEPROM_CSEL; \ |
@@ -50,7 +50,7 @@ | |||
50 | /* | 50 | /* |
51 | * clock in the nvram command and the register number. For the | 51 | * clock in the nvram command and the register number. For the |
52 | * national semiconductor nv ram chip the op code is 3 bits and | 52 | * national semiconductor nv ram chip the op code is 3 bits and |
53 | * the address is 6/8 bits. | 53 | * the address is 6/8 bits. |
54 | */ | 54 | */ |
55 | static inline void eeprom_cmd(volatile unsigned int *ctrl, unsigned cmd, | 55 | static inline void eeprom_cmd(volatile unsigned int *ctrl, unsigned cmd, |
56 | unsigned reg) | 56 | unsigned reg) |
@@ -90,7 +90,7 @@ unsigned short ip22_eeprom_read(volatile unsigned int *ctrl, int reg) | |||
90 | if (*ctrl & EEPROM_DATI) | 90 | if (*ctrl & EEPROM_DATI) |
91 | res |= 1; | 91 | res |= 1; |
92 | } | 92 | } |
93 | 93 | ||
94 | eeprom_cs_off(ctrl); | 94 | eeprom_cs_off(ctrl); |
95 | 95 | ||
96 | return res; | 96 | return res; |
@@ -113,7 +113,7 @@ unsigned short ip22_nvram_read(int reg) | |||
113 | reg <<= 1; | 113 | reg <<= 1; |
114 | tmp = hpc3c0->bbram[reg++] & 0xff; | 114 | tmp = hpc3c0->bbram[reg++] & 0xff; |
115 | return (tmp << 8) | (hpc3c0->bbram[reg] & 0xff); | 115 | return (tmp << 8) | (hpc3c0->bbram[reg] & 0xff); |
116 | } | 116 | } |
117 | } | 117 | } |
118 | 118 | ||
119 | EXPORT_SYMBOL(ip22_nvram_read); | 119 | EXPORT_SYMBOL(ip22_nvram_read); |
diff --git a/arch/mips/sgi-ip22/ip22-reset.c b/arch/mips/sgi-ip22/ip22-reset.c index ed5c60adce63..214ffd2e98a3 100644 --- a/arch/mips/sgi-ip22/ip22-reset.c +++ b/arch/mips/sgi-ip22/ip22-reset.c | |||
@@ -185,7 +185,7 @@ static irqreturn_t panel_int(int irq, void *dev_id, struct pt_regs *regs) | |||
185 | add_timer(&debounce_timer); | 185 | add_timer(&debounce_timer); |
186 | } | 186 | } |
187 | 187 | ||
188 | /* Power button was pressed | 188 | /* Power button was pressed |
189 | * ioc.ps page 22: "The Panel Register is called Power Control by Full | 189 | * ioc.ps page 22: "The Panel Register is called Power Control by Full |
190 | * House. Only lowest 2 bits are used. Guiness uses upper four bits | 190 | * House. Only lowest 2 bits are used. Guiness uses upper four bits |
191 | * for volume control". This is not true, all bits are pulled high | 191 | * for volume control". This is not true, all bits are pulled high |
diff --git a/arch/mips/sgi-ip22/ip22-time.c b/arch/mips/sgi-ip22/ip22-time.c index 173f76805ea3..df9b5694328a 100644 --- a/arch/mips/sgi-ip22/ip22-time.c +++ b/arch/mips/sgi-ip22/ip22-time.c | |||
@@ -126,7 +126,7 @@ static __init void indy_time_init(void) | |||
126 | unsigned long r4k_ticks[3]; | 126 | unsigned long r4k_ticks[3]; |
127 | unsigned long r4k_tick; | 127 | unsigned long r4k_tick; |
128 | 128 | ||
129 | /* | 129 | /* |
130 | * Figure out the r4k offset, the algorithm is very simple and works in | 130 | * Figure out the r4k offset, the algorithm is very simple and works in |
131 | * _all_ cases as long as the 8254 counter register itself works ok (as | 131 | * _all_ cases as long as the 8254 counter register itself works ok (as |
132 | * an interrupt driving timer it does not because of bug, this is why | 132 | * an interrupt driving timer it does not because of bug, this is why |
diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c index a160d04f7dbe..ef20d9ac0ba3 100644 --- a/arch/mips/sgi-ip27/ip27-memory.c +++ b/arch/mips/sgi-ip27/ip27-memory.c | |||
@@ -538,7 +538,7 @@ void __init mem_init(void) | |||
538 | for_each_online_node(node) { | 538 | for_each_online_node(node) { |
539 | unsigned slot, numslots; | 539 | unsigned slot, numslots; |
540 | struct page *end, *p; | 540 | struct page *end, *p; |
541 | 541 | ||
542 | /* | 542 | /* |
543 | * This will free up the bootmem, ie, slot 0 memory. | 543 | * This will free up the bootmem, ie, slot 0 memory. |
544 | */ | 544 | */ |
diff --git a/arch/mips/sgi-ip32/ip32-reset.c b/arch/mips/sgi-ip32/ip32-reset.c index 281f090e48a4..88e1f52059ff 100644 --- a/arch/mips/sgi-ip32/ip32-reset.c +++ b/arch/mips/sgi-ip32/ip32-reset.c | |||
@@ -140,7 +140,7 @@ static irqreturn_t ip32_rtc_int(int irq, void *dev_id, struct pt_regs *regs) | |||
140 | 140 | ||
141 | reg_c = CMOS_READ(RTC_INTR_FLAGS); | 141 | reg_c = CMOS_READ(RTC_INTR_FLAGS); |
142 | if (!(reg_c & RTC_IRQF)) { | 142 | if (!(reg_c & RTC_IRQF)) { |
143 | printk(KERN_WARNING | 143 | printk(KERN_WARNING |
144 | "%s: RTC IRQ without RTC_IRQF\n", __FUNCTION__); | 144 | "%s: RTC IRQ without RTC_IRQF\n", __FUNCTION__); |
145 | } | 145 | } |
146 | /* Wait until interrupt goes away */ | 146 | /* Wait until interrupt goes away */ |
diff --git a/arch/mips/sibyte/cfe/cfe_error.h b/arch/mips/sibyte/cfe/cfe_error.h index 77eb4935bfb4..975f00002cbe 100644 --- a/arch/mips/sibyte/cfe/cfe_error.h +++ b/arch/mips/sibyte/cfe/cfe_error.h | |||
@@ -17,15 +17,15 @@ | |||
17 | */ | 17 | */ |
18 | 18 | ||
19 | /* ********************************************************************* | 19 | /* ********************************************************************* |
20 | * | 20 | * |
21 | * Broadcom Common Firmware Environment (CFE) | 21 | * Broadcom Common Firmware Environment (CFE) |
22 | * | 22 | * |
23 | * Error codes File: cfe_error.h | 23 | * Error codes File: cfe_error.h |
24 | * | 24 | * |
25 | * CFE's global error code list is here. | 25 | * CFE's global error code list is here. |
26 | * | 26 | * |
27 | * Author: Mitch Lichtenberg | 27 | * Author: Mitch Lichtenberg |
28 | * | 28 | * |
29 | ********************************************************************* */ | 29 | ********************************************************************* */ |
30 | 30 | ||
31 | 31 | ||
diff --git a/arch/mips/sibyte/cfe/console.c b/arch/mips/sibyte/cfe/console.c index 53a5c1eb5611..7721100d0275 100644 --- a/arch/mips/sibyte/cfe/console.c +++ b/arch/mips/sibyte/cfe/console.c | |||
@@ -38,7 +38,7 @@ static void cfe_console_write(struct console *cons, const char *str, | |||
38 | last += written; | 38 | last += written; |
39 | } while (last < count); | 39 | } while (last < count); |
40 | } | 40 | } |
41 | 41 | ||
42 | } | 42 | } |
43 | 43 | ||
44 | static int cfe_console_setup(struct console *cons, char *str) | 44 | static int cfe_console_setup(struct console *cons, char *str) |
diff --git a/arch/mips/sibyte/cfe/setup.c b/arch/mips/sibyte/cfe/setup.c index d86943f9d812..7a2c7a8510d4 100644 --- a/arch/mips/sibyte/cfe/setup.c +++ b/arch/mips/sibyte/cfe/setup.c | |||
@@ -285,7 +285,7 @@ void __init prom_init(void) | |||
285 | while (1) ; | 285 | while (1) ; |
286 | } | 286 | } |
287 | cfe_init(cfe_handle, cfe_ept); | 287 | cfe_init(cfe_handle, cfe_ept); |
288 | /* | 288 | /* |
289 | * Get the handle for (at least) prom_putchar, possibly for | 289 | * Get the handle for (at least) prom_putchar, possibly for |
290 | * boot console | 290 | * boot console |
291 | */ | 291 | */ |
diff --git a/arch/mips/sibyte/cfe/smp.c b/arch/mips/sibyte/cfe/smp.c index 73392190d2b1..e44ce1a9eea9 100644 --- a/arch/mips/sibyte/cfe/smp.c +++ b/arch/mips/sibyte/cfe/smp.c | |||
@@ -57,7 +57,7 @@ void __init prom_prepare_cpus(unsigned int max_cpus) | |||
57 | void prom_boot_secondary(int cpu, struct task_struct *idle) | 57 | void prom_boot_secondary(int cpu, struct task_struct *idle) |
58 | { | 58 | { |
59 | int retval; | 59 | int retval; |
60 | 60 | ||
61 | retval = cfe_cpu_start(cpu_logical_map(cpu), &smp_bootstrap, | 61 | retval = cfe_cpu_start(cpu_logical_map(cpu), &smp_bootstrap, |
62 | __KSTK_TOS(idle), | 62 | __KSTK_TOS(idle), |
63 | (unsigned long)idle->thread_info, 0); | 63 | (unsigned long)idle->thread_info, 0); |
diff --git a/arch/mips/sibyte/sb1250/bus_watcher.c b/arch/mips/sibyte/sb1250/bus_watcher.c index 182a16f42e2d..1a97e3127aeb 100644 --- a/arch/mips/sibyte/sb1250/bus_watcher.c +++ b/arch/mips/sibyte/sb1250/bus_watcher.c | |||
@@ -10,13 +10,13 @@ | |||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
12 | * GNU General Public License for more details. | 12 | * GNU General Public License for more details. |
13 | * | 13 | * |
14 | * You should have received a copy of the GNU General Public License | 14 | * You should have received a copy of the GNU General Public License |
15 | * along with this program; if not, write to the Free Software | 15 | * along with this program; if not, write to the Free Software |
16 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 16 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
17 | */ | 17 | */ |
18 | 18 | ||
19 | /* | 19 | /* |
20 | * The Bus Watcher monitors internal bus transactions and maintains | 20 | * The Bus Watcher monitors internal bus transactions and maintains |
21 | * counts of transactions with error status, logging details and | 21 | * counts of transactions with error status, logging details and |
22 | * causing one of several interrupts. This driver provides a handler | 22 | * 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, | |||
155 | static void create_proc_decoder(struct bw_stats_struct *stats) | 155 | static void create_proc_decoder(struct bw_stats_struct *stats) |
156 | { | 156 | { |
157 | struct proc_dir_entry *ent; | 157 | struct proc_dir_entry *ent; |
158 | 158 | ||
159 | ent = create_proc_read_entry("bus_watcher", S_IWUSR | S_IRUGO, NULL, | 159 | ent = create_proc_read_entry("bus_watcher", S_IWUSR | S_IRUGO, NULL, |
160 | bw_read_proc, stats); | 160 | bw_read_proc, stats); |
161 | if (!ent) { | 161 | if (!ent) { |
diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c index 2728abbc94d2..2725b263cced 100644 --- a/arch/mips/sibyte/sb1250/irq.c +++ b/arch/mips/sibyte/sb1250/irq.c | |||
@@ -377,7 +377,7 @@ void __init arch_init_irq(void) | |||
377 | 377 | ||
378 | /* | 378 | /* |
379 | * Note that the timer interrupts are also mapped, but this is | 379 | * Note that the timer interrupts are also mapped, but this is |
380 | * done in sb1250_time_init(). Also, the profiling driver | 380 | * done in sb1250_time_init(). Also, the profiling driver |
381 | * does its own management of IP7. | 381 | * does its own management of IP7. |
382 | */ | 382 | */ |
383 | 383 | ||
@@ -392,7 +392,7 @@ void __init arch_init_irq(void) | |||
392 | if (kgdb_flag) { | 392 | if (kgdb_flag) { |
393 | kgdb_irq = K_INT_UART_0 + kgdb_port; | 393 | kgdb_irq = K_INT_UART_0 + kgdb_port; |
394 | 394 | ||
395 | #ifdef CONFIG_SIBYTE_SB1250_DUART | 395 | #ifdef CONFIG_SIBYTE_SB1250_DUART |
396 | sb1250_duart_present[kgdb_port] = 0; | 396 | sb1250_duart_present[kgdb_port] = 0; |
397 | #endif | 397 | #endif |
398 | /* Setup uart 1 settings, mapper */ | 398 | /* Setup uart 1 settings, mapper */ |
diff --git a/arch/mips/sibyte/swarm/rtc_m41t81.c b/arch/mips/sibyte/swarm/rtc_m41t81.c index 0e633ee8d83c..a686bb716ec6 100644 --- a/arch/mips/sibyte/swarm/rtc_m41t81.c +++ b/arch/mips/sibyte/swarm/rtc_m41t81.c | |||
@@ -128,7 +128,7 @@ static int m41t81_write(uint8_t addr, int b) | |||
128 | /* Clear error bit by writing a 1 */ | 128 | /* Clear error bit by writing a 1 */ |
129 | bus_writeq(M_SMB_ERROR, SMB_CSR(R_SMB_STATUS)); | 129 | bus_writeq(M_SMB_ERROR, SMB_CSR(R_SMB_STATUS)); |
130 | return -1; | 130 | return -1; |
131 | } | 131 | } |
132 | 132 | ||
133 | /* read the same byte again to make sure it is written */ | 133 | /* read the same byte again to make sure it is written */ |
134 | bus_writeq(V_SMB_ADDR(M41T81_CCR_ADDRESS) | V_SMB_TT_RD1BYTE, | 134 | 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) | |||
136 | 136 | ||
137 | while (bus_readq(SMB_CSR(R_SMB_STATUS)) & M_SMB_BUSY) | 137 | while (bus_readq(SMB_CSR(R_SMB_STATUS)) & M_SMB_BUSY) |
138 | ; | 138 | ; |
139 | 139 | ||
140 | return 0; | 140 | return 0; |
141 | } | 141 | } |
142 | 142 | ||
@@ -148,13 +148,13 @@ int m41t81_set_time(unsigned long t) | |||
148 | 148 | ||
149 | /* | 149 | /* |
150 | * Note the write order matters as it ensures the correctness. | 150 | * Note the write order matters as it ensures the correctness. |
151 | * When we write sec, 10th sec is clear. It is reasonable to | 151 | * When we write sec, 10th sec is clear. It is reasonable to |
152 | * believe we should finish writing min within a second. | 152 | * believe we should finish writing min within a second. |
153 | */ | 153 | */ |
154 | 154 | ||
155 | tm.tm_sec = BIN2BCD(tm.tm_sec); | 155 | tm.tm_sec = BIN2BCD(tm.tm_sec); |
156 | m41t81_write(M41T81REG_SC, tm.tm_sec); | 156 | m41t81_write(M41T81REG_SC, tm.tm_sec); |
157 | 157 | ||
158 | tm.tm_min = BIN2BCD(tm.tm_min); | 158 | tm.tm_min = BIN2BCD(tm.tm_min); |
159 | m41t81_write(M41T81REG_MN, tm.tm_min); | 159 | m41t81_write(M41T81REG_MN, tm.tm_min); |
160 | 160 | ||
@@ -187,7 +187,7 @@ unsigned long m41t81_get_time(void) | |||
187 | { | 187 | { |
188 | unsigned int year, mon, day, hour, min, sec; | 188 | unsigned int year, mon, day, hour, min, sec; |
189 | 189 | ||
190 | /* | 190 | /* |
191 | * min is valid if two reads of sec are the same. | 191 | * min is valid if two reads of sec are the same. |
192 | */ | 192 | */ |
193 | for (;;) { | 193 | for (;;) { |
diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c index 4742e4fc89f7..4daeaa413def 100644 --- a/arch/mips/sibyte/swarm/setup.c +++ b/arch/mips/sibyte/swarm/setup.c | |||
@@ -98,7 +98,7 @@ static int __init swarm_setup(void) | |||
98 | rtc_get_time = xicor_get_time; | 98 | rtc_get_time = xicor_get_time; |
99 | rtc_set_time = xicor_set_time; | 99 | rtc_set_time = xicor_set_time; |
100 | } | 100 | } |
101 | 101 | ||
102 | if (m41t81_probe()) { | 102 | if (m41t81_probe()) { |
103 | printk("swarm setup: M41T81 RTC detected.\n"); | 103 | printk("swarm setup: M41T81 RTC detected.\n"); |
104 | rtc_get_time = m41t81_get_time; | 104 | rtc_get_time = m41t81_get_time; |
diff --git a/arch/mips/sni/irq.c b/arch/mips/sni/irq.c index 62c760f14674..141a310d74d8 100644 --- a/arch/mips/sni/irq.c +++ b/arch/mips/sni/irq.c | |||
@@ -103,7 +103,7 @@ static unsigned int ls1bit8(unsigned int x) | |||
103 | 103 | ||
104 | /* | 104 | /* |
105 | * hwint 1 deals with EISA and SCSI interrupts, | 105 | * hwint 1 deals with EISA and SCSI interrupts, |
106 | * | 106 | * |
107 | * The EISA_INT bit in CSITPEND is high active, all others are low active. | 107 | * The EISA_INT bit in CSITPEND is high active, all others are low active. |
108 | */ | 108 | */ |
109 | void pciasic_hwint1(struct pt_regs *regs) | 109 | void pciasic_hwint1(struct pt_regs *regs) |
diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c index 8f67cee4317b..1b3f8a0903e1 100644 --- a/arch/mips/sni/setup.c +++ b/arch/mips/sni/setup.c | |||
@@ -111,7 +111,7 @@ static struct resource sni_mem_resource = { | |||
111 | * The RM200/RM300 has a few holes in it's PCI/EISA memory address space used | 111 | * The RM200/RM300 has a few holes in it's PCI/EISA memory address space used |
112 | * for other purposes. Be paranoid and allocate all of the before the PCI | 112 | * for other purposes. Be paranoid and allocate all of the before the PCI |
113 | * code gets a chance to to map anything else there ... | 113 | * code gets a chance to to map anything else there ... |
114 | * | 114 | * |
115 | * This leaves the following areas available: | 115 | * This leaves the following areas available: |
116 | * | 116 | * |
117 | * 0x10000000 - 0x1009ffff (640kB) PCI/EISA/ISA Bus Memory | 117 | * 0x10000000 - 0x1009ffff (640kB) PCI/EISA/ISA Bus Memory |
diff --git a/arch/mips/tx4927/common/tx4927_irq_handler.S b/arch/mips/tx4927/common/tx4927_irq_handler.S index ca123e28d1ef..dd3ceda9d712 100644 --- a/arch/mips/tx4927/common/tx4927_irq_handler.S +++ b/arch/mips/tx4927/common/tx4927_irq_handler.S | |||
@@ -42,13 +42,13 @@ | |||
42 | CLI | 42 | CLI |
43 | .set at | 43 | .set at |
44 | 44 | ||
45 | mfc0 t0, CP0_CAUSE | 45 | mfc0 t0, CP0_CAUSE |
46 | mfc0 t1, CP0_STATUS | 46 | mfc0 t1, CP0_STATUS |
47 | and t0, t1 | 47 | and t0, t1 |
48 | 48 | ||
49 | andi t1, t0, STATUSF_IP7 /* cpu timer */ | 49 | andi t1, t0, STATUSF_IP7 /* cpu timer */ |
50 | bnez t1, ll_ip7 | 50 | bnez t1, ll_ip7 |
51 | 51 | ||
52 | /* IP6..IP3 multiplexed -- do not use */ | 52 | /* IP6..IP3 multiplexed -- do not use */ |
53 | 53 | ||
54 | andi t1, t0, STATUSF_IP2 /* tx4927 pic */ | 54 | andi t1, t0, STATUSF_IP2 /* tx4927 pic */ |
diff --git a/arch/mips/tx4927/common/tx4927_setup.c b/arch/mips/tx4927/common/tx4927_setup.c index 16bcbdc6d1cc..26d7c53612a8 100644 --- a/arch/mips/tx4927/common/tx4927_setup.c +++ b/arch/mips/tx4927/common/tx4927_setup.c | |||
@@ -152,7 +152,7 @@ dump_cp0(char *key) | |||
152 | print_cp0(key, 16, "CONFIG ", read_c0_config()); | 152 | print_cp0(key, 16, "CONFIG ", read_c0_config()); |
153 | return; | 153 | return; |
154 | } | 154 | } |
155 | 155 | ||
156 | void print_pic(char *key, u32 reg, char *name) | 156 | void print_pic(char *key, u32 reg, char *name) |
157 | { | 157 | { |
158 | printk("%s pic:0x%08x:%s=0x%08x\n", key, reg, name, | 158 | printk("%s pic:0x%08x:%s=0x%08x\n", key, reg, name, |
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/Makefile b/arch/mips/tx4927/toshiba_rbtx4927/Makefile index 86ca4cf2d587..c1a377a80a5d 100644 --- a/arch/mips/tx4927/toshiba_rbtx4927/Makefile +++ b/arch/mips/tx4927/toshiba_rbtx4927/Makefile | |||
@@ -1,5 +1,5 @@ | |||
1 | obj-y += toshiba_rbtx4927_prom.o | 1 | obj-y += toshiba_rbtx4927_prom.o |
2 | obj-y += toshiba_rbtx4927_setup.o | 2 | obj-y += toshiba_rbtx4927_setup.o |
3 | obj-y += toshiba_rbtx4927_irq.o | 3 | obj-y += toshiba_rbtx4927_irq.o |
4 | 4 | ||
5 | EXTRA_AFLAGS := $(CFLAGS) | 5 | EXTRA_AFLAGS := $(CFLAGS) |
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c index fd5b433f83b7..aee07ff2212a 100644 --- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c +++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c | |||
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | 32 | ||
33 | /* | 33 | /* |
34 | IRQ Device | 34 | IRQ Device |
35 | 00 RBTX4927-ISA/00 | 35 | 00 RBTX4927-ISA/00 |
36 | 01 RBTX4927-ISA/01 PS2/Keyboard | 36 | 01 RBTX4927-ISA/01 PS2/Keyboard |
37 | 02 RBTX4927-ISA/02 Cascade RBTX4927-ISA (irqs 8-15) | 37 | 02 RBTX4927-ISA/02 Cascade RBTX4927-ISA (irqs 8-15) |
@@ -52,15 +52,15 @@ IRQ Device | |||
52 | 16 TX4927-CP0/00 Software 0 | 52 | 16 TX4927-CP0/00 Software 0 |
53 | 17 TX4927-CP0/01 Software 1 | 53 | 17 TX4927-CP0/01 Software 1 |
54 | 18 TX4927-CP0/02 Cascade TX4927-CP0 | 54 | 18 TX4927-CP0/02 Cascade TX4927-CP0 |
55 | 19 TX4927-CP0/03 Multiplexed -- do not use | 55 | 19 TX4927-CP0/03 Multiplexed -- do not use |
56 | 20 TX4927-CP0/04 Multiplexed -- do not use | 56 | 20 TX4927-CP0/04 Multiplexed -- do not use |
57 | 21 TX4927-CP0/05 Multiplexed -- do not use | 57 | 21 TX4927-CP0/05 Multiplexed -- do not use |
58 | 22 TX4927-CP0/06 Multiplexed -- do not use | 58 | 22 TX4927-CP0/06 Multiplexed -- do not use |
59 | 23 TX4927-CP0/07 CPU TIMER | 59 | 23 TX4927-CP0/07 CPU TIMER |
60 | 60 | ||
61 | 24 TX4927-PIC/00 | 61 | 24 TX4927-PIC/00 |
62 | 25 TX4927-PIC/01 | 62 | 25 TX4927-PIC/01 |
63 | 26 TX4927-PIC/02 | 63 | 26 TX4927-PIC/02 |
64 | 27 TX4927-PIC/03 Cascade RBTX4927-IOC | 64 | 27 TX4927-PIC/03 Cascade RBTX4927-IOC |
65 | 28 TX4927-PIC/04 | 65 | 28 TX4927-PIC/04 |
66 | 29 TX4927-PIC/05 RBTX4927 RTL-8019AS ethernet | 66 | 29 TX4927-PIC/05 RBTX4927 RTL-8019AS ethernet |
@@ -80,7 +80,7 @@ IRQ Device | |||
80 | 43 TX4927-PIC/19 | 80 | 43 TX4927-PIC/19 |
81 | 44 TX4927-PIC/20 | 81 | 44 TX4927-PIC/20 |
82 | 45 TX4927-PIC/21 | 82 | 45 TX4927-PIC/21 |
83 | 46 TX4927-PIC/22 TX4927 PCI PCI-ERR | 83 | 46 TX4927-PIC/22 TX4927 PCI PCI-ERR |
84 | 47 TX4927-PIC/23 TX4927 PCI PCI-PMA (not used) | 84 | 47 TX4927-PIC/23 TX4927 PCI PCI-PMA (not used) |
85 | 48 TX4927-PIC/24 | 85 | 48 TX4927-PIC/24 |
86 | 49 TX4927-PIC/25 | 86 | 49 TX4927-PIC/25 |
@@ -100,7 +100,7 @@ IRQ Device | |||
100 | 62 RBTX4927-IOC/06 | 100 | 62 RBTX4927-IOC/06 |
101 | 63 RBTX4927-IOC/07 | 101 | 63 RBTX4927-IOC/07 |
102 | 102 | ||
103 | NOTES: | 103 | NOTES: |
104 | SouthBridge/INTR is mapped to SouthBridge/A=PCI-B/#58 | 104 | SouthBridge/INTR is mapped to SouthBridge/A=PCI-B/#58 |
105 | SouthBridge/ISA/pin=0 no pci irq used by this device | 105 | SouthBridge/ISA/pin=0 no pci irq used by this device |
106 | SouthBridge/IDE/pin=1 no pci irq used by this device, using INTR via ISA IRQ14 | 106 | 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 | |||
175 | static const u32 toshiba_rbtx4927_irq_debug_flag = | 175 | static const u32 toshiba_rbtx4927_irq_debug_flag = |
176 | (TOSHIBA_RBTX4927_IRQ_NONE | TOSHIBA_RBTX4927_IRQ_INFO | | 176 | (TOSHIBA_RBTX4927_IRQ_NONE | TOSHIBA_RBTX4927_IRQ_INFO | |
177 | TOSHIBA_RBTX4927_IRQ_WARN | TOSHIBA_RBTX4927_IRQ_EROR | 177 | TOSHIBA_RBTX4927_IRQ_WARN | TOSHIBA_RBTX4927_IRQ_EROR |
178 | // | TOSHIBA_RBTX4927_IRQ_IOC_INIT | 178 | // | TOSHIBA_RBTX4927_IRQ_IOC_INIT |
179 | // | TOSHIBA_RBTX4927_IRQ_IOC_STARTUP | 179 | // | TOSHIBA_RBTX4927_IRQ_IOC_STARTUP |
180 | // | TOSHIBA_RBTX4927_IRQ_IOC_SHUTDOWN | 180 | // | TOSHIBA_RBTX4927_IRQ_IOC_SHUTDOWN |
181 | // | TOSHIBA_RBTX4927_IRQ_IOC_ENABLE | 181 | // | TOSHIBA_RBTX4927_IRQ_IOC_ENABLE |
182 | // | TOSHIBA_RBTX4927_IRQ_IOC_DISABLE | 182 | // | TOSHIBA_RBTX4927_IRQ_IOC_DISABLE |
183 | // | TOSHIBA_RBTX4927_IRQ_IOC_MASK | 183 | // | TOSHIBA_RBTX4927_IRQ_IOC_MASK |
184 | // | TOSHIBA_RBTX4927_IRQ_IOC_ENDIRQ | 184 | // | TOSHIBA_RBTX4927_IRQ_IOC_ENDIRQ |
185 | // | TOSHIBA_RBTX4927_IRQ_ISA_INIT | 185 | // | TOSHIBA_RBTX4927_IRQ_ISA_INIT |
186 | // | TOSHIBA_RBTX4927_IRQ_ISA_STARTUP | 186 | // | TOSHIBA_RBTX4927_IRQ_ISA_STARTUP |
187 | // | TOSHIBA_RBTX4927_IRQ_ISA_SHUTDOWN | 187 | // | TOSHIBA_RBTX4927_IRQ_ISA_SHUTDOWN |
188 | // | TOSHIBA_RBTX4927_IRQ_ISA_ENABLE | 188 | // | TOSHIBA_RBTX4927_IRQ_ISA_ENABLE |
189 | // | TOSHIBA_RBTX4927_IRQ_ISA_DISABLE | 189 | // | TOSHIBA_RBTX4927_IRQ_ISA_DISABLE |
190 | // | TOSHIBA_RBTX4927_IRQ_ISA_MASK | 190 | // | TOSHIBA_RBTX4927_IRQ_ISA_MASK |
191 | // | TOSHIBA_RBTX4927_IRQ_ISA_ENDIRQ | 191 | // | TOSHIBA_RBTX4927_IRQ_ISA_ENDIRQ |
192 | ); | 192 | ); |
193 | #endif | 193 | #endif |
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c index 8724ea3ae04e..fc0720599fd9 100644 --- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c +++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c | |||
@@ -395,7 +395,7 @@ static int __init tx4927_pcibios_init(void) | |||
395 | /* enable secondary ide */ | 395 | /* enable secondary ide */ |
396 | v08_43 |= 0x80; | 396 | v08_43 |= 0x80; |
397 | 397 | ||
398 | /* | 398 | /* |
399 | * !!! DO NOT REMOVE THIS COMMENT IT IS REQUIRED BY SMSC !!! | 399 | * !!! DO NOT REMOVE THIS COMMENT IT IS REQUIRED BY SMSC !!! |
400 | * | 400 | * |
401 | * This line of code is intended to provide the user with a work | 401 | * This line of code is intended to provide the user with a work |
diff --git a/arch/mips/vr41xx/common/vrc4173.c b/arch/mips/vr41xx/common/vrc4173.c index 5475dd72e264..ba58764ef8ea 100644 --- a/arch/mips/vr41xx/common/vrc4173.c +++ b/arch/mips/vr41xx/common/vrc4173.c | |||
@@ -476,7 +476,7 @@ static inline int vrc4173_icu_init(int cascade_irq) | |||
476 | 476 | ||
477 | if (cascade_irq < GIU_IRQ(0) || cascade_irq > GIU_IRQ(15)) | 477 | if (cascade_irq < GIU_IRQ(0) || cascade_irq > GIU_IRQ(15)) |
478 | return -EINVAL; | 478 | return -EINVAL; |
479 | 479 | ||
480 | vrc4173_outw(0, VRC4173_MSYSINT1REG); | 480 | vrc4173_outw(0, VRC4173_MSYSINT1REG); |
481 | 481 | ||
482 | vr41xx_set_irq_trigger(GIU_IRQ_TO_PIN(cascade_irq), TRIGGER_LEVEL, SIGNAL_THROUGH); | 482 | vr41xx_set_irq_trigger(GIU_IRQ_TO_PIN(cascade_irq), TRIGGER_LEVEL, SIGNAL_THROUGH); |
diff --git a/include/asm-mips/asmmacro.h b/include/asm-mips/asmmacro.h index 40ceedcf454e..30b18ea6cb11 100644 --- a/include/asm-mips/asmmacro.h +++ b/include/asm-mips/asmmacro.h | |||
@@ -7,10 +7,10 @@ | |||
7 | */ | 7 | */ |
8 | #ifndef _ASM_ASMMACRO_H | 8 | #ifndef _ASM_ASMMACRO_H |
9 | #define _ASM_ASMMACRO_H | 9 | #define _ASM_ASMMACRO_H |
10 | 10 | ||
11 | #include <linux/config.h> | 11 | #include <linux/config.h> |
12 | #include <asm/hazards.h> | 12 | #include <asm/hazards.h> |
13 | 13 | ||
14 | #ifdef CONFIG_32BIT | 14 | #ifdef CONFIG_32BIT |
15 | #include <asm/asmmacro-32.h> | 15 | #include <asm/asmmacro-32.h> |
16 | #endif | 16 | #endif |
diff --git a/include/asm-mips/bitops.h b/include/asm-mips/bitops.h index bc136dcfdbe6..eb8d79dba11c 100644 --- a/include/asm-mips/bitops.h +++ b/include/asm-mips/bitops.h | |||
@@ -20,13 +20,13 @@ | |||
20 | #define SZLONG_MASK 31UL | 20 | #define SZLONG_MASK 31UL |
21 | #define __LL "ll " | 21 | #define __LL "ll " |
22 | #define __SC "sc " | 22 | #define __SC "sc " |
23 | #define cpu_to_lelongp(x) cpu_to_le32p((__u32 *) (x)) | 23 | #define cpu_to_lelongp(x) cpu_to_le32p((__u32 *) (x)) |
24 | #elif (_MIPS_SZLONG == 64) | 24 | #elif (_MIPS_SZLONG == 64) |
25 | #define SZLONG_LOG 6 | 25 | #define SZLONG_LOG 6 |
26 | #define SZLONG_MASK 63UL | 26 | #define SZLONG_MASK 63UL |
27 | #define __LL "lld " | 27 | #define __LL "lld " |
28 | #define __SC "scd " | 28 | #define __SC "scd " |
29 | #define cpu_to_lelongp(x) cpu_to_le64p((__u64 *) (x)) | 29 | #define cpu_to_lelongp(x) cpu_to_le64p((__u64 *) (x)) |
30 | #endif | 30 | #endif |
31 | 31 | ||
32 | #ifdef __KERNEL__ | 32 | #ifdef __KERNEL__ |
diff --git a/include/asm-mips/ddb5xxx/ddb5477.h b/include/asm-mips/ddb5xxx/ddb5477.h index ae3e2a38fd5f..a438548e6ef3 100644 --- a/include/asm-mips/ddb5xxx/ddb5477.h +++ b/include/asm-mips/ddb5xxx/ddb5477.h | |||
@@ -247,7 +247,7 @@ extern void ll_vrc5477_irq_disable(int vrc5477_irq); | |||
247 | * All PCI irq but INTC are active low. | 247 | * All PCI irq but INTC are active low. |
248 | */ | 248 | */ |
249 | 249 | ||
250 | /* | 250 | /* |
251 | * irq number block assignment | 251 | * irq number block assignment |
252 | */ | 252 | */ |
253 | 253 | ||
@@ -285,7 +285,7 @@ extern void ll_vrc5477_irq_disable(int vrc5477_irq); | |||
285 | #define VRC5477_IRQ_IOPCI_INTB (17 + VRC5477_IRQ_BASE) /* USB-P */ | 285 | #define VRC5477_IRQ_IOPCI_INTB (17 + VRC5477_IRQ_BASE) /* USB-P */ |
286 | #define VRC5477_IRQ_IOPCI_INTC (18 + VRC5477_IRQ_BASE) /* AC97 */ | 286 | #define VRC5477_IRQ_IOPCI_INTC (18 + VRC5477_IRQ_BASE) /* AC97 */ |
287 | #define VRC5477_IRQ_IOPCI_INTD (19 + VRC5477_IRQ_BASE) /* Reserved */ | 287 | #define VRC5477_IRQ_IOPCI_INTD (19 + VRC5477_IRQ_BASE) /* Reserved */ |
288 | #define VRC5477_IRQ_UART1 (20 + VRC5477_IRQ_BASE) | 288 | #define VRC5477_IRQ_UART1 (20 + VRC5477_IRQ_BASE) |
289 | #define VRC5477_IRQ_SPT0 (21 + VRC5477_IRQ_BASE) /* special purpose timer 0 */ | 289 | #define VRC5477_IRQ_SPT0 (21 + VRC5477_IRQ_BASE) /* special purpose timer 0 */ |
290 | #define VRC5477_IRQ_GPT0 (22 + VRC5477_IRQ_BASE) /* general purpose timer 0 */ | 290 | #define VRC5477_IRQ_GPT0 (22 + VRC5477_IRQ_BASE) /* general purpose timer 0 */ |
291 | #define VRC5477_IRQ_GPT1 (23 + VRC5477_IRQ_BASE) /* general purpose timer 1 */ | 291 | #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); | |||
301 | /* | 301 | /* |
302 | * i2859 irq assignment | 302 | * i2859 irq assignment |
303 | */ | 303 | */ |
304 | #define I8259_IRQ_RESERVED_0 (0 + I8259_IRQ_BASE) | 304 | #define I8259_IRQ_RESERVED_0 (0 + I8259_IRQ_BASE) |
305 | #define I8259_IRQ_KEYBOARD (1 + I8259_IRQ_BASE) /* M1543 default */ | 305 | #define I8259_IRQ_KEYBOARD (1 + I8259_IRQ_BASE) /* M1543 default */ |
306 | #define I8259_IRQ_CASCADE (2 + I8259_IRQ_BASE) | 306 | #define I8259_IRQ_CASCADE (2 + I8259_IRQ_BASE) |
307 | #define I8259_IRQ_UART_B (3 + I8259_IRQ_BASE) /* M1543 default, may conflict with RTC according to schematic diagram */ | 307 | #define I8259_IRQ_UART_B (3 + I8259_IRQ_BASE) /* M1543 default, may conflict with RTC according to schematic diagram */ |
diff --git a/include/asm-mips/fpregdef.h b/include/asm-mips/fpregdef.h index 1d9aa0979181..2b5fddc8f487 100644 --- a/include/asm-mips/fpregdef.h +++ b/include/asm-mips/fpregdef.h | |||
@@ -13,7 +13,7 @@ | |||
13 | #define _ASM_FPREGDEF_H | 13 | #define _ASM_FPREGDEF_H |
14 | 14 | ||
15 | #include <asm/sgidefs.h> | 15 | #include <asm/sgidefs.h> |
16 | 16 | ||
17 | #if _MIPS_SIM == _MIPS_SIM_ABI32 | 17 | #if _MIPS_SIM == _MIPS_SIM_ABI32 |
18 | 18 | ||
19 | /* | 19 | /* |
@@ -56,7 +56,7 @@ | |||
56 | #define fcr31 $31 /* FPU status register */ | 56 | #define fcr31 $31 /* FPU status register */ |
57 | 57 | ||
58 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ | 58 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ |
59 | 59 | ||
60 | #if _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32 | 60 | #if _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32 |
61 | 61 | ||
62 | #define fv0 $f0 /* return value */ | 62 | #define fv0 $f0 /* return value */ |
diff --git a/include/asm-mips/fpu.h b/include/asm-mips/fpu.h index 6cb38d5c0407..ea24e733b1bc 100644 --- a/include/asm-mips/fpu.h +++ b/include/asm-mips/fpu.h | |||
@@ -82,7 +82,7 @@ do { \ | |||
82 | 82 | ||
83 | static inline int is_fpu_owner(void) | 83 | static inline int is_fpu_owner(void) |
84 | { | 84 | { |
85 | return cpu_has_fpu && test_thread_flag(TIF_USEDFPU); | 85 | return cpu_has_fpu && test_thread_flag(TIF_USEDFPU); |
86 | } | 86 | } |
87 | 87 | ||
88 | static inline void own_fpu(void) | 88 | static inline void own_fpu(void) |
@@ -90,7 +90,7 @@ static inline void own_fpu(void) | |||
90 | if (cpu_has_fpu) { | 90 | if (cpu_has_fpu) { |
91 | __enable_fpu(); | 91 | __enable_fpu(); |
92 | KSTK_STATUS(current) |= ST0_CU1; | 92 | KSTK_STATUS(current) |= ST0_CU1; |
93 | set_thread_flag(TIF_USEDFPU); | 93 | set_thread_flag(TIF_USEDFPU); |
94 | } | 94 | } |
95 | } | 95 | } |
96 | 96 | ||
@@ -98,7 +98,7 @@ static inline void lose_fpu(void) | |||
98 | { | 98 | { |
99 | if (cpu_has_fpu) { | 99 | if (cpu_has_fpu) { |
100 | KSTK_STATUS(current) &= ~ST0_CU1; | 100 | KSTK_STATUS(current) &= ~ST0_CU1; |
101 | clear_thread_flag(TIF_USEDFPU); | 101 | clear_thread_flag(TIF_USEDFPU); |
102 | __disable_fpu(); | 102 | __disable_fpu(); |
103 | } | 103 | } |
104 | } | 104 | } |
@@ -127,7 +127,7 @@ static inline void restore_fp(struct task_struct *tsk) | |||
127 | static inline fpureg_t *get_fpu_regs(struct task_struct *tsk) | 127 | static inline fpureg_t *get_fpu_regs(struct task_struct *tsk) |
128 | { | 128 | { |
129 | if (cpu_has_fpu) { | 129 | if (cpu_has_fpu) { |
130 | if ((tsk == current) && is_fpu_owner()) | 130 | if ((tsk == current) && is_fpu_owner()) |
131 | _save_fp(current); | 131 | _save_fp(current); |
132 | return tsk->thread.fpu.hard.fpr; | 132 | return tsk->thread.fpu.hard.fpr; |
133 | } | 133 | } |
diff --git a/include/asm-mips/ip32/mace.h b/include/asm-mips/ip32/mace.h index 2b7b0fdeac19..432011b16c26 100644 --- a/include/asm-mips/ip32/mace.h +++ b/include/asm-mips/ip32/mace.h | |||
@@ -94,7 +94,7 @@ struct mace_video { | |||
94 | unsigned long xxx; /* later... */ | 94 | unsigned long xxx; /* later... */ |
95 | }; | 95 | }; |
96 | 96 | ||
97 | /* | 97 | /* |
98 | * Ethernet interface | 98 | * Ethernet interface |
99 | */ | 99 | */ |
100 | struct mace_ethernet { | 100 | struct mace_ethernet { |
@@ -129,7 +129,7 @@ struct mace_ethernet { | |||
129 | volatile unsigned long rx_fifo; | 129 | volatile unsigned long rx_fifo; |
130 | }; | 130 | }; |
131 | 131 | ||
132 | /* | 132 | /* |
133 | * Peripherals | 133 | * Peripherals |
134 | */ | 134 | */ |
135 | 135 | ||
@@ -251,7 +251,7 @@ struct mace_timers { | |||
251 | timer_reg audio_out2; | 251 | timer_reg audio_out2; |
252 | timer_reg video_in1; | 252 | timer_reg video_in1; |
253 | timer_reg video_in2; | 253 | timer_reg video_in2; |
254 | timer_reg video_out; | 254 | timer_reg video_out; |
255 | }; | 255 | }; |
256 | 256 | ||
257 | struct mace_perif { | 257 | struct mace_perif { |
@@ -272,7 +272,7 @@ struct mace_perif { | |||
272 | }; | 272 | }; |
273 | 273 | ||
274 | 274 | ||
275 | /* | 275 | /* |
276 | * ISA peripherals | 276 | * ISA peripherals |
277 | */ | 277 | */ |
278 | 278 | ||
diff --git a/include/asm-mips/lasat/serial.h b/include/asm-mips/lasat/serial.h index 21d0fb7cee64..9e88c7669c7a 100644 --- a/include/asm-mips/lasat/serial.h +++ b/include/asm-mips/lasat/serial.h | |||
@@ -1,13 +1,13 @@ | |||
1 | #include <asm/lasat/lasat.h> | 1 | #include <asm/lasat/lasat.h> |
2 | 2 | ||
3 | /* Lasat 100 boards serial configuration */ | 3 | /* Lasat 100 boards serial configuration */ |
4 | #define LASAT_BASE_BAUD_100 ( 7372800 / 16 ) | 4 | #define LASAT_BASE_BAUD_100 ( 7372800 / 16 ) |
5 | #define LASAT_UART_REGS_BASE_100 0x1c8b0000 | 5 | #define LASAT_UART_REGS_BASE_100 0x1c8b0000 |
6 | #define LASAT_UART_REGS_SHIFT_100 2 | 6 | #define LASAT_UART_REGS_SHIFT_100 2 |
7 | #define LASATINT_UART_100 8 | 7 | #define LASATINT_UART_100 8 |
8 | 8 | ||
9 | /* * LASAT 200 boards serial configuration */ | 9 | /* * LASAT 200 boards serial configuration */ |
10 | #define LASAT_BASE_BAUD_200 (100000000 / 16 / 12) | 10 | #define LASAT_BASE_BAUD_200 (100000000 / 16 / 12) |
11 | #define LASAT_UART_REGS_BASE_200 (Vrc5074_PHYS_BASE + 0x0300) | 11 | #define LASAT_UART_REGS_BASE_200 (Vrc5074_PHYS_BASE + 0x0300) |
12 | #define LASAT_UART_REGS_SHIFT_200 3 | 12 | #define LASAT_UART_REGS_SHIFT_200 3 |
13 | #define LASATINT_UART_200 13 | 13 | #define LASATINT_UART_200 13 |
diff --git a/include/asm-mips/mach-au1x00/au1000.h b/include/asm-mips/mach-au1x00/au1000.h index 2b36ea346910..148bae2fa7d3 100644 --- a/include/asm-mips/mach-au1x00/au1000.h +++ b/include/asm-mips/mach-au1x00/au1000.h | |||
@@ -1383,7 +1383,7 @@ extern au1xxx_irq_map_t au1xxx_irq_map[]; | |||
1383 | #define PCI_IO_START 0 | 1383 | #define PCI_IO_START 0 |
1384 | #define PCI_IO_END 0 | 1384 | #define PCI_IO_END 0 |
1385 | #define PCI_MEM_START 0 | 1385 | #define PCI_MEM_START 0 |
1386 | #define PCI_MEM_END 0 | 1386 | #define PCI_MEM_END 0 |
1387 | #define PCI_FIRST_DEVFN 0 | 1387 | #define PCI_FIRST_DEVFN 0 |
1388 | #define PCI_LAST_DEVFN 0 | 1388 | #define PCI_LAST_DEVFN 0 |
1389 | #endif | 1389 | #endif |
diff --git a/include/asm-mips/mach-db1x00/db1x00.h b/include/asm-mips/mach-db1x00/db1x00.h index 4691398a414f..efafe65258b6 100644 --- a/include/asm-mips/mach-db1x00/db1x00.h +++ b/include/asm-mips/mach-db1x00/db1x00.h | |||
@@ -23,7 +23,7 @@ | |||
23 | * | 23 | * |
24 | * ######################################################################## | 24 | * ######################################################################## |
25 | * | 25 | * |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | #ifndef __ASM_DB1X00_H | 28 | #ifndef __ASM_DB1X00_H |
29 | #define __ASM_DB1X00_H | 29 | #define __ASM_DB1X00_H |
diff --git a/include/asm-mips/mach-jazz/floppy.h b/include/asm-mips/mach-jazz/floppy.h index 8cf0d042c864..c9dad99b1232 100644 --- a/include/asm-mips/mach-jazz/floppy.h +++ b/include/asm-mips/mach-jazz/floppy.h | |||
@@ -92,7 +92,7 @@ static inline int fd_request_irq(void) | |||
92 | return request_irq(FLOPPY_IRQ, floppy_interrupt, | 92 | return request_irq(FLOPPY_IRQ, floppy_interrupt, |
93 | SA_INTERRUPT | SA_SAMPLE_RANDOM, "floppy", NULL); | 93 | SA_INTERRUPT | SA_SAMPLE_RANDOM, "floppy", NULL); |
94 | } | 94 | } |
95 | 95 | ||
96 | static inline void fd_free_irq(void) | 96 | static inline void fd_free_irq(void) |
97 | { | 97 | { |
98 | free_irq(FLOPPY_IRQ, NULL); | 98 | free_irq(FLOPPY_IRQ, NULL); |
diff --git a/include/asm-mips/mach-pb1x00/pb1500.h b/include/asm-mips/mach-pb1x00/pb1500.h index d6c779747b3c..ff6d40c87a25 100644 --- a/include/asm-mips/mach-pb1x00/pb1500.h +++ b/include/asm-mips/mach-pb1x00/pb1500.h | |||
@@ -33,11 +33,11 @@ | |||
33 | #define PCI_BOARD_REG 0xAE000010 | 33 | #define PCI_BOARD_REG 0xAE000010 |
34 | #define PCMCIA_BOARD_REG 0xAE000010 | 34 | #define PCMCIA_BOARD_REG 0xAE000010 |
35 | #define PC_DEASSERT_RST 0x80 | 35 | #define PC_DEASSERT_RST 0x80 |
36 | #define PC_DRV_EN 0x10 | 36 | #define PC_DRV_EN 0x10 |
37 | #define PB1500_G_CONTROL 0xAE000014 | 37 | #define PB1500_G_CONTROL 0xAE000014 |
38 | #define PB1500_RST_VDDI 0xAE00001C | 38 | #define PB1500_RST_VDDI 0xAE00001C |
39 | #define PB1500_LEDS 0xAE000018 | 39 | #define PB1500_LEDS 0xAE000018 |
40 | 40 | ||
41 | #define PB1500_HEX_LED 0xAF000004 | 41 | #define PB1500_HEX_LED 0xAF000004 |
42 | #define PB1500_HEX_LED_BLANK 0xAF000008 | 42 | #define PB1500_HEX_LED_BLANK 0xAF000008 |
43 | 43 | ||
diff --git a/include/asm-mips/r4kcache.h b/include/asm-mips/r4kcache.h index da03a32c1ca7..5bea49feec66 100644 --- a/include/asm-mips/r4kcache.h +++ b/include/asm-mips/r4kcache.h | |||
@@ -171,11 +171,11 @@ static inline void blast_dcache16(void) | |||
171 | unsigned long start = INDEX_BASE; | 171 | unsigned long start = INDEX_BASE; |
172 | unsigned long end = start + current_cpu_data.dcache.waysize; | 172 | unsigned long end = start + current_cpu_data.dcache.waysize; |
173 | unsigned long ws_inc = 1UL << current_cpu_data.dcache.waybit; | 173 | unsigned long ws_inc = 1UL << current_cpu_data.dcache.waybit; |
174 | unsigned long ws_end = current_cpu_data.dcache.ways << | 174 | unsigned long ws_end = current_cpu_data.dcache.ways << |
175 | current_cpu_data.dcache.waybit; | 175 | current_cpu_data.dcache.waybit; |
176 | unsigned long ws, addr; | 176 | unsigned long ws, addr; |
177 | 177 | ||
178 | for (ws = 0; ws < ws_end; ws += ws_inc) | 178 | for (ws = 0; ws < ws_end; ws += ws_inc) |
179 | for (addr = start; addr < end; addr += 0x200) | 179 | for (addr = start; addr < end; addr += 0x200) |
180 | cache16_unroll32(addr|ws,Index_Writeback_Inv_D); | 180 | cache16_unroll32(addr|ws,Index_Writeback_Inv_D); |
181 | } | 181 | } |
@@ -200,8 +200,8 @@ static inline void blast_dcache16_page_indexed(unsigned long page) | |||
200 | current_cpu_data.dcache.waybit; | 200 | current_cpu_data.dcache.waybit; |
201 | unsigned long ws, addr; | 201 | unsigned long ws, addr; |
202 | 202 | ||
203 | for (ws = 0; ws < ws_end; ws += ws_inc) | 203 | for (ws = 0; ws < ws_end; ws += ws_inc) |
204 | for (addr = start; addr < end; addr += 0x200) | 204 | for (addr = start; addr < end; addr += 0x200) |
205 | cache16_unroll32(addr|ws,Index_Writeback_Inv_D); | 205 | cache16_unroll32(addr|ws,Index_Writeback_Inv_D); |
206 | } | 206 | } |
207 | 207 | ||
@@ -214,8 +214,8 @@ static inline void blast_icache16(void) | |||
214 | current_cpu_data.icache.waybit; | 214 | current_cpu_data.icache.waybit; |
215 | unsigned long ws, addr; | 215 | unsigned long ws, addr; |
216 | 216 | ||
217 | for (ws = 0; ws < ws_end; ws += ws_inc) | 217 | for (ws = 0; ws < ws_end; ws += ws_inc) |
218 | for (addr = start; addr < end; addr += 0x200) | 218 | for (addr = start; addr < end; addr += 0x200) |
219 | cache16_unroll32(addr|ws,Index_Invalidate_I); | 219 | cache16_unroll32(addr|ws,Index_Invalidate_I); |
220 | } | 220 | } |
221 | 221 | ||
@@ -239,8 +239,8 @@ static inline void blast_icache16_page_indexed(unsigned long page) | |||
239 | current_cpu_data.icache.waybit; | 239 | current_cpu_data.icache.waybit; |
240 | unsigned long ws, addr; | 240 | unsigned long ws, addr; |
241 | 241 | ||
242 | for (ws = 0; ws < ws_end; ws += ws_inc) | 242 | for (ws = 0; ws < ws_end; ws += ws_inc) |
243 | for (addr = start; addr < end; addr += 0x200) | 243 | for (addr = start; addr < end; addr += 0x200) |
244 | cache16_unroll32(addr|ws,Index_Invalidate_I); | 244 | cache16_unroll32(addr|ws,Index_Invalidate_I); |
245 | } | 245 | } |
246 | 246 | ||
@@ -249,11 +249,11 @@ static inline void blast_scache16(void) | |||
249 | unsigned long start = INDEX_BASE; | 249 | unsigned long start = INDEX_BASE; |
250 | unsigned long end = start + current_cpu_data.scache.waysize; | 250 | unsigned long end = start + current_cpu_data.scache.waysize; |
251 | unsigned long ws_inc = 1UL << current_cpu_data.scache.waybit; | 251 | unsigned long ws_inc = 1UL << current_cpu_data.scache.waybit; |
252 | unsigned long ws_end = current_cpu_data.scache.ways << | 252 | unsigned long ws_end = current_cpu_data.scache.ways << |
253 | current_cpu_data.scache.waybit; | 253 | current_cpu_data.scache.waybit; |
254 | unsigned long ws, addr; | 254 | unsigned long ws, addr; |
255 | 255 | ||
256 | for (ws = 0; ws < ws_end; ws += ws_inc) | 256 | for (ws = 0; ws < ws_end; ws += ws_inc) |
257 | for (addr = start; addr < end; addr += 0x200) | 257 | for (addr = start; addr < end; addr += 0x200) |
258 | cache16_unroll32(addr|ws,Index_Writeback_Inv_SD); | 258 | cache16_unroll32(addr|ws,Index_Writeback_Inv_SD); |
259 | } | 259 | } |
@@ -278,8 +278,8 @@ static inline void blast_scache16_page_indexed(unsigned long page) | |||
278 | current_cpu_data.scache.waybit; | 278 | current_cpu_data.scache.waybit; |
279 | unsigned long ws, addr; | 279 | unsigned long ws, addr; |
280 | 280 | ||
281 | for (ws = 0; ws < ws_end; ws += ws_inc) | 281 | for (ws = 0; ws < ws_end; ws += ws_inc) |
282 | for (addr = start; addr < end; addr += 0x200) | 282 | for (addr = start; addr < end; addr += 0x200) |
283 | cache16_unroll32(addr|ws,Index_Writeback_Inv_SD); | 283 | cache16_unroll32(addr|ws,Index_Writeback_Inv_SD); |
284 | } | 284 | } |
285 | 285 | ||
@@ -318,8 +318,8 @@ static inline void blast_dcache32(void) | |||
318 | current_cpu_data.dcache.waybit; | 318 | current_cpu_data.dcache.waybit; |
319 | unsigned long ws, addr; | 319 | unsigned long ws, addr; |
320 | 320 | ||
321 | for (ws = 0; ws < ws_end; ws += ws_inc) | 321 | for (ws = 0; ws < ws_end; ws += ws_inc) |
322 | for (addr = start; addr < end; addr += 0x400) | 322 | for (addr = start; addr < end; addr += 0x400) |
323 | cache32_unroll32(addr|ws,Index_Writeback_Inv_D); | 323 | cache32_unroll32(addr|ws,Index_Writeback_Inv_D); |
324 | } | 324 | } |
325 | 325 | ||
@@ -343,8 +343,8 @@ static inline void blast_dcache32_page_indexed(unsigned long page) | |||
343 | current_cpu_data.dcache.waybit; | 343 | current_cpu_data.dcache.waybit; |
344 | unsigned long ws, addr; | 344 | unsigned long ws, addr; |
345 | 345 | ||
346 | for (ws = 0; ws < ws_end; ws += ws_inc) | 346 | for (ws = 0; ws < ws_end; ws += ws_inc) |
347 | for (addr = start; addr < end; addr += 0x400) | 347 | for (addr = start; addr < end; addr += 0x400) |
348 | cache32_unroll32(addr|ws,Index_Writeback_Inv_D); | 348 | cache32_unroll32(addr|ws,Index_Writeback_Inv_D); |
349 | } | 349 | } |
350 | 350 | ||
@@ -357,8 +357,8 @@ static inline void blast_icache32(void) | |||
357 | current_cpu_data.icache.waybit; | 357 | current_cpu_data.icache.waybit; |
358 | unsigned long ws, addr; | 358 | unsigned long ws, addr; |
359 | 359 | ||
360 | for (ws = 0; ws < ws_end; ws += ws_inc) | 360 | for (ws = 0; ws < ws_end; ws += ws_inc) |
361 | for (addr = start; addr < end; addr += 0x400) | 361 | for (addr = start; addr < end; addr += 0x400) |
362 | cache32_unroll32(addr|ws,Index_Invalidate_I); | 362 | cache32_unroll32(addr|ws,Index_Invalidate_I); |
363 | } | 363 | } |
364 | 364 | ||
@@ -383,7 +383,7 @@ static inline void blast_icache32_page_indexed(unsigned long page) | |||
383 | unsigned long ws, addr; | 383 | unsigned long ws, addr; |
384 | 384 | ||
385 | for (ws = 0; ws < ws_end; ws += ws_inc) | 385 | for (ws = 0; ws < ws_end; ws += ws_inc) |
386 | for (addr = start; addr < end; addr += 0x400) | 386 | for (addr = start; addr < end; addr += 0x400) |
387 | cache32_unroll32(addr|ws,Index_Invalidate_I); | 387 | cache32_unroll32(addr|ws,Index_Invalidate_I); |
388 | } | 388 | } |
389 | 389 | ||
@@ -392,11 +392,11 @@ static inline void blast_scache32(void) | |||
392 | unsigned long start = INDEX_BASE; | 392 | unsigned long start = INDEX_BASE; |
393 | unsigned long end = start + current_cpu_data.scache.waysize; | 393 | unsigned long end = start + current_cpu_data.scache.waysize; |
394 | unsigned long ws_inc = 1UL << current_cpu_data.scache.waybit; | 394 | unsigned long ws_inc = 1UL << current_cpu_data.scache.waybit; |
395 | unsigned long ws_end = current_cpu_data.scache.ways << | 395 | unsigned long ws_end = current_cpu_data.scache.ways << |
396 | current_cpu_data.scache.waybit; | 396 | current_cpu_data.scache.waybit; |
397 | unsigned long ws, addr; | 397 | unsigned long ws, addr; |
398 | 398 | ||
399 | for (ws = 0; ws < ws_end; ws += ws_inc) | 399 | for (ws = 0; ws < ws_end; ws += ws_inc) |
400 | for (addr = start; addr < end; addr += 0x400) | 400 | for (addr = start; addr < end; addr += 0x400) |
401 | cache32_unroll32(addr|ws,Index_Writeback_Inv_SD); | 401 | cache32_unroll32(addr|ws,Index_Writeback_Inv_SD); |
402 | } | 402 | } |
@@ -421,8 +421,8 @@ static inline void blast_scache32_page_indexed(unsigned long page) | |||
421 | current_cpu_data.scache.waybit; | 421 | current_cpu_data.scache.waybit; |
422 | unsigned long ws, addr; | 422 | unsigned long ws, addr; |
423 | 423 | ||
424 | for (ws = 0; ws < ws_end; ws += ws_inc) | 424 | for (ws = 0; ws < ws_end; ws += ws_inc) |
425 | for (addr = start; addr < end; addr += 0x400) | 425 | for (addr = start; addr < end; addr += 0x400) |
426 | cache32_unroll32(addr|ws,Index_Writeback_Inv_SD); | 426 | cache32_unroll32(addr|ws,Index_Writeback_Inv_SD); |
427 | } | 427 | } |
428 | 428 | ||
@@ -461,8 +461,8 @@ static inline void blast_icache64(void) | |||
461 | current_cpu_data.icache.waybit; | 461 | current_cpu_data.icache.waybit; |
462 | unsigned long ws, addr; | 462 | unsigned long ws, addr; |
463 | 463 | ||
464 | for (ws = 0; ws < ws_end; ws += ws_inc) | 464 | for (ws = 0; ws < ws_end; ws += ws_inc) |
465 | for (addr = start; addr < end; addr += 0x800) | 465 | for (addr = start; addr < end; addr += 0x800) |
466 | cache64_unroll32(addr|ws,Index_Invalidate_I); | 466 | cache64_unroll32(addr|ws,Index_Invalidate_I); |
467 | } | 467 | } |
468 | 468 | ||
@@ -487,7 +487,7 @@ static inline void blast_icache64_page_indexed(unsigned long page) | |||
487 | unsigned long ws, addr; | 487 | unsigned long ws, addr; |
488 | 488 | ||
489 | for (ws = 0; ws < ws_end; ws += ws_inc) | 489 | for (ws = 0; ws < ws_end; ws += ws_inc) |
490 | for (addr = start; addr < end; addr += 0x800) | 490 | for (addr = start; addr < end; addr += 0x800) |
491 | cache64_unroll32(addr|ws,Index_Invalidate_I); | 491 | cache64_unroll32(addr|ws,Index_Invalidate_I); |
492 | } | 492 | } |
493 | 493 | ||
@@ -496,11 +496,11 @@ static inline void blast_scache64(void) | |||
496 | unsigned long start = INDEX_BASE; | 496 | unsigned long start = INDEX_BASE; |
497 | unsigned long end = start + current_cpu_data.scache.waysize; | 497 | unsigned long end = start + current_cpu_data.scache.waysize; |
498 | unsigned long ws_inc = 1UL << current_cpu_data.scache.waybit; | 498 | unsigned long ws_inc = 1UL << current_cpu_data.scache.waybit; |
499 | unsigned long ws_end = current_cpu_data.scache.ways << | 499 | unsigned long ws_end = current_cpu_data.scache.ways << |
500 | current_cpu_data.scache.waybit; | 500 | current_cpu_data.scache.waybit; |
501 | unsigned long ws, addr; | 501 | unsigned long ws, addr; |
502 | 502 | ||
503 | for (ws = 0; ws < ws_end; ws += ws_inc) | 503 | for (ws = 0; ws < ws_end; ws += ws_inc) |
504 | for (addr = start; addr < end; addr += 0x800) | 504 | for (addr = start; addr < end; addr += 0x800) |
505 | cache64_unroll32(addr|ws,Index_Writeback_Inv_SD); | 505 | cache64_unroll32(addr|ws,Index_Writeback_Inv_SD); |
506 | } | 506 | } |
@@ -525,8 +525,8 @@ static inline void blast_scache64_page_indexed(unsigned long page) | |||
525 | current_cpu_data.scache.waybit; | 525 | current_cpu_data.scache.waybit; |
526 | unsigned long ws, addr; | 526 | unsigned long ws, addr; |
527 | 527 | ||
528 | for (ws = 0; ws < ws_end; ws += ws_inc) | 528 | for (ws = 0; ws < ws_end; ws += ws_inc) |
529 | for (addr = start; addr < end; addr += 0x800) | 529 | for (addr = start; addr < end; addr += 0x800) |
530 | cache64_unroll32(addr|ws,Index_Writeback_Inv_SD); | 530 | cache64_unroll32(addr|ws,Index_Writeback_Inv_SD); |
531 | } | 531 | } |
532 | 532 | ||
@@ -561,11 +561,11 @@ static inline void blast_scache128(void) | |||
561 | unsigned long start = INDEX_BASE; | 561 | unsigned long start = INDEX_BASE; |
562 | unsigned long end = start + current_cpu_data.scache.waysize; | 562 | unsigned long end = start + current_cpu_data.scache.waysize; |
563 | unsigned long ws_inc = 1UL << current_cpu_data.scache.waybit; | 563 | unsigned long ws_inc = 1UL << current_cpu_data.scache.waybit; |
564 | unsigned long ws_end = current_cpu_data.scache.ways << | 564 | unsigned long ws_end = current_cpu_data.scache.ways << |
565 | current_cpu_data.scache.waybit; | 565 | current_cpu_data.scache.waybit; |
566 | unsigned long ws, addr; | 566 | unsigned long ws, addr; |
567 | 567 | ||
568 | for (ws = 0; ws < ws_end; ws += ws_inc) | 568 | for (ws = 0; ws < ws_end; ws += ws_inc) |
569 | for (addr = start; addr < end; addr += 0x1000) | 569 | for (addr = start; addr < end; addr += 0x1000) |
570 | cache128_unroll32(addr|ws,Index_Writeback_Inv_SD); | 570 | cache128_unroll32(addr|ws,Index_Writeback_Inv_SD); |
571 | } | 571 | } |
@@ -590,8 +590,8 @@ static inline void blast_scache128_page_indexed(unsigned long page) | |||
590 | current_cpu_data.scache.waybit; | 590 | current_cpu_data.scache.waybit; |
591 | unsigned long ws, addr; | 591 | unsigned long ws, addr; |
592 | 592 | ||
593 | for (ws = 0; ws < ws_end; ws += ws_inc) | 593 | for (ws = 0; ws < ws_end; ws += ws_inc) |
594 | for (addr = start; addr < end; addr += 0x1000) | 594 | for (addr = start; addr < end; addr += 0x1000) |
595 | cache128_unroll32(addr|ws,Index_Writeback_Inv_SD); | 595 | cache128_unroll32(addr|ws,Index_Writeback_Inv_SD); |
596 | } | 596 | } |
597 | 597 | ||
diff --git a/include/asm-mips/rtc.h b/include/asm-mips/rtc.h index 31c0c2347f4f..3c4b637fd925 100644 --- a/include/asm-mips/rtc.h +++ b/include/asm-mips/rtc.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * include/asm-mips/rtc.h | 2 | * include/asm-mips/rtc.h |
3 | * | 3 | * |
4 | * (Really an interface for drivers/char/genrtc.c) | 4 | * (Really an interface for drivers/char/genrtc.c) |
5 | * | 5 | * |
diff --git a/include/asm-mips/sgi/gio.h b/include/asm-mips/sgi/gio.h index a38d66f99872..889cf028c95d 100644 --- a/include/asm-mips/sgi/gio.h +++ b/include/asm-mips/sgi/gio.h | |||
@@ -16,7 +16,7 @@ | |||
16 | * | 16 | * |
17 | * The Indigo and Indy have two GIO bus connectors. Indigo2 (all models) have | 17 | * The Indigo and Indy have two GIO bus connectors. Indigo2 (all models) have |
18 | * three physical connectors, but only two slots, GFX and EXP0. | 18 | * three physical connectors, but only two slots, GFX and EXP0. |
19 | * | 19 | * |
20 | * There is 10MB of GIO address space for GIO64 slot devices | 20 | * There is 10MB of GIO address space for GIO64 slot devices |
21 | * slot# slot type address range size | 21 | * slot# slot type address range size |
22 | * ----- --------- ----------------------- ----- | 22 | * ----- --------- ----------------------- ----- |
diff --git a/include/asm-mips/sgi/hpc3.h b/include/asm-mips/sgi/hpc3.h index a5b988d7327a..ac3dfc7af5b0 100644 --- a/include/asm-mips/sgi/hpc3.h +++ b/include/asm-mips/sgi/hpc3.h | |||
@@ -221,7 +221,7 @@ struct hpc3_regs { | |||
221 | #define HPC3_BESTAT_PIDMASK 0x3f700 /* DMA channel parity identifier */ | 221 | #define HPC3_BESTAT_PIDMASK 0x3f700 /* DMA channel parity identifier */ |
222 | 222 | ||
223 | u32 _unused1[0x14000/4 - 5]; /* padding */ | 223 | u32 _unused1[0x14000/4 - 5]; /* padding */ |
224 | 224 | ||
225 | /* Now direct PIO per-HPC3 peripheral access to external regs. */ | 225 | /* Now direct PIO per-HPC3 peripheral access to external regs. */ |
226 | volatile u32 scsi0_ext[256]; /* SCSI channel 0 external regs */ | 226 | volatile u32 scsi0_ext[256]; /* SCSI channel 0 external regs */ |
227 | u32 _unused2[0x7c00/4]; | 227 | u32 _unused2[0x7c00/4]; |
@@ -304,7 +304,7 @@ struct hpc3_regs { | |||
304 | volatile u32 bbram[8192-50-14]; /* Battery backed ram */ | 304 | volatile u32 bbram[8192-50-14]; /* Battery backed ram */ |
305 | }; | 305 | }; |
306 | 306 | ||
307 | /* | 307 | /* |
308 | * It is possible to have two HPC3's within the address space on | 308 | * It is possible to have two HPC3's within the address space on |
309 | * one machine, though only having one is more likely on an Indy. | 309 | * one machine, though only having one is more likely on an Indy. |
310 | */ | 310 | */ |
diff --git a/include/asm-mips/sgi/ioc.h b/include/asm-mips/sgi/ioc.h index 169187f53fbc..f3e3dc9bb732 100644 --- a/include/asm-mips/sgi/ioc.h +++ b/include/asm-mips/sgi/ioc.h | |||
@@ -16,7 +16,7 @@ | |||
16 | #include <linux/types.h> | 16 | #include <linux/types.h> |
17 | #include <asm/sgi/pi1.h> | 17 | #include <asm/sgi/pi1.h> |
18 | 18 | ||
19 | /* | 19 | /* |
20 | * All registers are 8-bit wide alligned on 32-bit boundary. Bad things | 20 | * All registers are 8-bit wide alligned on 32-bit boundary. Bad things |
21 | * happen if you try word access them. You have been warned. | 21 | * happen if you try word access them. You have been warned. |
22 | */ | 22 | */ |
@@ -138,7 +138,7 @@ struct sgioc_regs { | |||
138 | u8 _sysid[3]; | 138 | u8 _sysid[3]; |
139 | volatile u8 sysid; | 139 | volatile u8 sysid; |
140 | #define SGIOC_SYSID_FULLHOUSE 0x01 | 140 | #define SGIOC_SYSID_FULLHOUSE 0x01 |
141 | #define SGIOC_SYSID_BOARDREV(x) ((x & 0xe0) > 5) | 141 | #define SGIOC_SYSID_BOARDREV(x) ((x & 0xe0) > 5) |
142 | #define SGIOC_SYSID_CHIPREV(x) ((x & 0x1e) > 1) | 142 | #define SGIOC_SYSID_CHIPREV(x) ((x & 0x1e) > 1) |
143 | u32 _unused2; | 143 | u32 _unused2; |
144 | u8 _read[3]; | 144 | u8 _read[3]; |
diff --git a/include/asm-mips/sgi/ip22.h b/include/asm-mips/sgi/ip22.h index 97d73adb4e40..bbfc05c3cab9 100644 --- a/include/asm-mips/sgi/ip22.h +++ b/include/asm-mips/sgi/ip22.h | |||
@@ -12,7 +12,7 @@ | |||
12 | #ifndef _SGI_IP22_H | 12 | #ifndef _SGI_IP22_H |
13 | #define _SGI_IP22_H | 13 | #define _SGI_IP22_H |
14 | 14 | ||
15 | /* | 15 | /* |
16 | * These are the virtual IRQ numbers, we divide all IRQ's into | 16 | * These are the virtual IRQ numbers, we divide all IRQ's into |
17 | * 'spaces', the 'space' determines where and how to enable/disable | 17 | * 'spaces', the 'space' determines where and how to enable/disable |
18 | * that particular IRQ on an SGI machine. HPC DMA and MC DMA interrups | 18 | * that particular IRQ on an SGI machine. HPC DMA and MC DMA interrups |
diff --git a/include/asm-mips/sgi/mc.h b/include/asm-mips/sgi/mc.h index fd98f930607c..c52f7834c7c8 100644 --- a/include/asm-mips/sgi/mc.h +++ b/include/asm-mips/sgi/mc.h | |||
@@ -182,14 +182,14 @@ struct sgimc_regs { | |||
182 | volatile u32 dtlb_hi3; | 182 | volatile u32 dtlb_hi3; |
183 | u32 _unused33; | 183 | u32 _unused33; |
184 | volatile u32 dtlb_lo3; | 184 | volatile u32 dtlb_lo3; |
185 | 185 | ||
186 | u32 _unused34[0x0392]; | 186 | u32 _unused34[0x0392]; |
187 | 187 | ||
188 | u32 _unused35; | 188 | u32 _unused35; |
189 | volatile u32 rpsscounter; /* Chirps at 100ns */ | 189 | volatile u32 rpsscounter; /* Chirps at 100ns */ |
190 | 190 | ||
191 | u32 _unused36[0x1000/4-2*4]; | 191 | u32 _unused36[0x1000/4-2*4]; |
192 | 192 | ||
193 | u32 _unused37; | 193 | u32 _unused37; |
194 | volatile u32 maddronly; /* Address DMA goes at */ | 194 | volatile u32 maddronly; /* Address DMA goes at */ |
195 | u32 _unused38; | 195 | u32 _unused38; |
diff --git a/include/asm-mips/sibyte/carmel.h b/include/asm-mips/sibyte/carmel.h index 7ac5da13ce8a..b5e7dae19f0f 100644 --- a/include/asm-mips/sibyte/carmel.h +++ b/include/asm-mips/sibyte/carmel.h | |||
@@ -25,12 +25,12 @@ | |||
25 | 25 | ||
26 | #define SIBYTE_BOARD_NAME "Carmel" | 26 | #define SIBYTE_BOARD_NAME "Carmel" |
27 | 27 | ||
28 | #define GPIO_PHY_INTERRUPT 2 | 28 | #define GPIO_PHY_INTERRUPT 2 |
29 | #define GPIO_NONMASKABLE_INT 3 | 29 | #define GPIO_NONMASKABLE_INT 3 |
30 | #define GPIO_CF_INSERTED 6 | 30 | #define GPIO_CF_INSERTED 6 |
31 | #define GPIO_MONTEREY_RESET 7 | 31 | #define GPIO_MONTEREY_RESET 7 |
32 | #define GPIO_QUADUART_INT 8 | 32 | #define GPIO_QUADUART_INT 8 |
33 | #define GPIO_CF_INT 9 | 33 | #define GPIO_CF_INT 9 |
34 | #define GPIO_FPGA_CCLK 10 | 34 | #define GPIO_FPGA_CCLK 10 |
35 | #define GPIO_FPGA_DOUT 11 | 35 | #define GPIO_FPGA_DOUT 11 |
36 | #define GPIO_FPGA_DIN 12 | 36 | #define GPIO_FPGA_DIN 12 |
diff --git a/include/asm-mips/sibyte/sb1250_defs.h b/include/asm-mips/sibyte/sb1250_defs.h index 96088fb074a4..40ef97c76c8b 100644 --- a/include/asm-mips/sibyte/sb1250_defs.h +++ b/include/asm-mips/sibyte/sb1250_defs.h | |||
@@ -1,23 +1,23 @@ | |||
1 | /* ********************************************************************* | 1 | /* ********************************************************************* |
2 | * SB1250 Board Support Package | 2 | * SB1250 Board Support Package |
3 | * | 3 | * |
4 | * Global constants and macros File: sb1250_defs.h | 4 | * Global constants and macros File: sb1250_defs.h |
5 | * | 5 | * |
6 | * This file contains macros and definitions used by the other | 6 | * This file contains macros and definitions used by the other |
7 | * include files. | 7 | * include files. |
8 | * | 8 | * |
9 | * SB1250 specification level: User's manual 1/02/02 | 9 | * SB1250 specification level: User's manual 1/02/02 |
10 | * | 10 | * |
11 | * Author: Mitch Lichtenberg | 11 | * Author: Mitch Lichtenberg |
12 | * | 12 | * |
13 | ********************************************************************* | 13 | ********************************************************************* |
14 | * | 14 | * |
15 | * Copyright 2000,2001,2002,2003 | 15 | * Copyright 2000,2001,2002,2003 |
16 | * Broadcom Corporation. All rights reserved. | 16 | * Broadcom Corporation. All rights reserved. |
17 | * | 17 | * |
18 | * This program is free software; you can redistribute it and/or | 18 | * This program is free software; you can redistribute it and/or |
19 | * modify it under the terms of the GNU General Public License as | 19 | * modify it under the terms of the GNU General Public License as |
20 | * published by the Free Software Foundation; either version 2 of | 20 | * published by the Free Software Foundation; either version 2 of |
21 | * the License, or (at your option) any later version. | 21 | * the License, or (at your option) any later version. |
22 | * | 22 | * |
23 | * This program is distributed in the hope that it will be useful, | 23 | * This program is distributed in the hope that it will be useful, |
@@ -27,7 +27,7 @@ | |||
27 | * | 27 | * |
28 | * You should have received a copy of the GNU General Public License | 28 | * You should have received a copy of the GNU General Public License |
29 | * along with this program; if not, write to the Free Software | 29 | * along with this program; if not, write to the Free Software |
30 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, | 30 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, |
31 | * MA 02111-1307 USA | 31 | * MA 02111-1307 USA |
32 | ********************************************************************* */ | 32 | ********************************************************************* */ |
33 | 33 | ||
@@ -105,7 +105,7 @@ | |||
105 | #define SIBYTE_HDR_FMASK_112x_ALL 0x0000f00 | 105 | #define SIBYTE_HDR_FMASK_112x_ALL 0x0000f00 |
106 | #define SIBYTE_HDR_FMASK_112x_PASS1 0x0000100 | 106 | #define SIBYTE_HDR_FMASK_112x_PASS1 0x0000100 |
107 | 107 | ||
108 | /* Bit mask for chip/revision. (use _ALL for all revisions of a chip). */ | 108 | /* Bit mask for chip/revision. (use _ALL for all revisions of a chip). */ |
109 | #define SIBYTE_HDR_FMASK(chip, pass) \ | 109 | #define SIBYTE_HDR_FMASK(chip, pass) \ |
110 | (SIBYTE_HDR_FMASK_ ## chip ## _ ## pass) | 110 | (SIBYTE_HDR_FMASK_ ## chip ## _ ## pass) |
111 | #define SIBYTE_HDR_FMASK_ALLREVS(chip) \ | 111 | #define SIBYTE_HDR_FMASK_ALLREVS(chip) \ |
@@ -150,31 +150,31 @@ | |||
150 | 150 | ||
151 | /* ********************************************************************* | 151 | /* ********************************************************************* |
152 | * Naming schemes for constants in these files: | 152 | * Naming schemes for constants in these files: |
153 | * | 153 | * |
154 | * M_xxx MASK constant (identifies bits in a register). | 154 | * M_xxx MASK constant (identifies bits in a register). |
155 | * For multi-bit fields, all bits in the field will | 155 | * For multi-bit fields, all bits in the field will |
156 | * be set. | 156 | * be set. |
157 | * | 157 | * |
158 | * K_xxx "Code" constant (value for data in a multi-bit | 158 | * K_xxx "Code" constant (value for data in a multi-bit |
159 | * field). The value is right justified. | 159 | * field). The value is right justified. |
160 | * | 160 | * |
161 | * V_xxx "Value" constant. This is the same as the | 161 | * V_xxx "Value" constant. This is the same as the |
162 | * corresponding "K_xxx" constant, except it is | 162 | * corresponding "K_xxx" constant, except it is |
163 | * shifted to the correct position in the register. | 163 | * shifted to the correct position in the register. |
164 | * | 164 | * |
165 | * S_xxx SHIFT constant. This is the number of bits that | 165 | * S_xxx SHIFT constant. This is the number of bits that |
166 | * a field value (code) needs to be shifted | 166 | * a field value (code) needs to be shifted |
167 | * (towards the left) to put the value in the right | 167 | * (towards the left) to put the value in the right |
168 | * position for the register. | 168 | * position for the register. |
169 | * | 169 | * |
170 | * A_xxx ADDRESS constant. This will be a physical | 170 | * A_xxx ADDRESS constant. This will be a physical |
171 | * address. Use the PHYS_TO_K1 macro to generate | 171 | * address. Use the PHYS_TO_K1 macro to generate |
172 | * a K1SEG address. | 172 | * a K1SEG address. |
173 | * | 173 | * |
174 | * R_xxx RELATIVE offset constant. This is an offset from | 174 | * R_xxx RELATIVE offset constant. This is an offset from |
175 | * an A_xxx constant (usually the first register in | 175 | * an A_xxx constant (usually the first register in |
176 | * a group). | 176 | * a group). |
177 | * | 177 | * |
178 | * G_xxx(X) GET value. This macro obtains a multi-bit field | 178 | * G_xxx(X) GET value. This macro obtains a multi-bit field |
179 | * from a register, masks it, and shifts it to | 179 | * from a register, masks it, and shifts it to |
180 | * the bottom of the register (retrieving a K_xxx | 180 | * the bottom of the register (retrieving a K_xxx |
@@ -189,7 +189,7 @@ | |||
189 | 189 | ||
190 | 190 | ||
191 | /* | 191 | /* |
192 | * Cast to 64-bit number. Presumably the syntax is different in | 192 | * Cast to 64-bit number. Presumably the syntax is different in |
193 | * assembly language. | 193 | * assembly language. |
194 | * | 194 | * |
195 | * Note: you'll need to define uint32_t and uint64_t in your headers. | 195 | * Note: you'll need to define uint32_t and uint64_t in your headers. |
diff --git a/include/asm-mips/sibyte/sb1250_dma.h b/include/asm-mips/sibyte/sb1250_dma.h index f1b08d32338d..3cdb48f50ed0 100644 --- a/include/asm-mips/sibyte/sb1250_dma.h +++ b/include/asm-mips/sibyte/sb1250_dma.h | |||
@@ -1,24 +1,24 @@ | |||
1 | /* ********************************************************************* | 1 | /* ********************************************************************* |
2 | * SB1250 Board Support Package | 2 | * SB1250 Board Support Package |
3 | * | 3 | * |
4 | * DMA definitions File: sb1250_dma.h | 4 | * DMA definitions File: sb1250_dma.h |
5 | * | 5 | * |
6 | * This module contains constants and macros useful for | 6 | * This module contains constants and macros useful for |
7 | * programming the SB1250's DMA controllers, both the data mover | 7 | * programming the SB1250's DMA controllers, both the data mover |
8 | * and the Ethernet DMA. | 8 | * and the Ethernet DMA. |
9 | * | 9 | * |
10 | * SB1250 specification level: User's manual 1/02/02 | 10 | * SB1250 specification level: User's manual 1/02/02 |
11 | * | 11 | * |
12 | * Author: Mitch Lichtenberg | 12 | * Author: Mitch Lichtenberg |
13 | * | 13 | * |
14 | ********************************************************************* | 14 | ********************************************************************* |
15 | * | 15 | * |
16 | * Copyright 2000,2001,2002,2003 | 16 | * Copyright 2000,2001,2002,2003 |
17 | * Broadcom Corporation. All rights reserved. | 17 | * Broadcom Corporation. All rights reserved. |
18 | * | 18 | * |
19 | * This program is free software; you can redistribute it and/or | 19 | * This program is free software; you can redistribute it and/or |
20 | * modify it under the terms of the GNU General Public License as | 20 | * modify it under the terms of the GNU General Public License as |
21 | * published by the Free Software Foundation; either version 2 of | 21 | * published by the Free Software Foundation; either version 2 of |
22 | * the License, or (at your option) any later version. | 22 | * the License, or (at your option) any later version. |
23 | * | 23 | * |
24 | * This program is distributed in the hope that it will be useful, | 24 | * This program is distributed in the hope that it will be useful, |
@@ -28,7 +28,7 @@ | |||
28 | * | 28 | * |
29 | * You should have received a copy of the GNU General Public License | 29 | * You should have received a copy of the GNU General Public License |
30 | * along with this program; if not, write to the Free Software | 30 | * along with this program; if not, write to the Free Software |
31 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, | 31 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, |
32 | * MA 02111-1307 USA | 32 | * MA 02111-1307 USA |
33 | ********************************************************************* */ | 33 | ********************************************************************* */ |
34 | 34 | ||
@@ -43,9 +43,9 @@ | |||
43 | * DMA Registers | 43 | * DMA Registers |
44 | ********************************************************************* */ | 44 | ********************************************************************* */ |
45 | 45 | ||
46 | /* | 46 | /* |
47 | * Ethernet and Serial DMA Configuration Register 0 (Table 7-4) | 47 | * Ethernet and Serial DMA Configuration Register 0 (Table 7-4) |
48 | * Registers: DMA_CONFIG0_MAC_x_RX_CH_0 | 48 | * Registers: DMA_CONFIG0_MAC_x_RX_CH_0 |
49 | * Registers: DMA_CONFIG0_MAC_x_TX_CH_0 | 49 | * Registers: DMA_CONFIG0_MAC_x_TX_CH_0 |
50 | * Registers: DMA_CONFIG0_SER_x_RX | 50 | * Registers: DMA_CONFIG0_SER_x_RX |
51 | * Registers: DMA_CONFIG0_SER_x_TX | 51 | * Registers: DMA_CONFIG0_SER_x_TX |
@@ -98,7 +98,7 @@ | |||
98 | 98 | ||
99 | /* | 99 | /* |
100 | * Ethernet and Serial DMA Configuration Register 1 (Table 7-5) | 100 | * Ethernet and Serial DMA Configuration Register 1 (Table 7-5) |
101 | * Registers: DMA_CONFIG1_MAC_x_RX_CH_0 | 101 | * Registers: DMA_CONFIG1_MAC_x_RX_CH_0 |
102 | * Registers: DMA_CONFIG1_DMA_x_TX_CH_0 | 102 | * Registers: DMA_CONFIG1_DMA_x_TX_CH_0 |
103 | * Registers: DMA_CONFIG1_SER_x_RX | 103 | * Registers: DMA_CONFIG1_SER_x_RX |
104 | * Registers: DMA_CONFIG1_SER_x_TX | 104 | * Registers: DMA_CONFIG1_SER_x_TX |
@@ -152,11 +152,11 @@ | |||
152 | /* | 152 | /* |
153 | * DMA Descriptor Count Registers (Table 7-8) | 153 | * DMA Descriptor Count Registers (Table 7-8) |
154 | */ | 154 | */ |
155 | 155 | ||
156 | /* No bitfields */ | 156 | /* No bitfields */ |
157 | 157 | ||
158 | 158 | ||
159 | /* | 159 | /* |
160 | * Current Descriptor Address Register (Table 7-11) | 160 | * Current Descriptor Address Register (Table 7-11) |
161 | */ | 161 | */ |
162 | 162 | ||
@@ -275,14 +275,14 @@ | |||
275 | #define V_DMA_DSCRB_STATUS(x) _SB_MAKEVALUE(x,S_DMA_DSCRB_STATUS) | 275 | #define V_DMA_DSCRB_STATUS(x) _SB_MAKEVALUE(x,S_DMA_DSCRB_STATUS) |
276 | #define G_DMA_DSCRB_STATUS(x) _SB_GETVALUE(x,S_DMA_DSCRB_STATUS,M_DMA_DSCRB_STATUS) | 276 | #define G_DMA_DSCRB_STATUS(x) _SB_GETVALUE(x,S_DMA_DSCRB_STATUS,M_DMA_DSCRB_STATUS) |
277 | 277 | ||
278 | /* | 278 | /* |
279 | * Ethernet Descriptor Status Bits (Table 7-15) | 279 | * Ethernet Descriptor Status Bits (Table 7-15) |
280 | */ | 280 | */ |
281 | 281 | ||
282 | #define M_DMA_ETHRX_BADIP4CS _SB_MAKEMASK1(51) | 282 | #define M_DMA_ETHRX_BADIP4CS _SB_MAKEMASK1(51) |
283 | #define M_DMA_ETHRX_DSCRERR _SB_MAKEMASK1(52) | 283 | #define M_DMA_ETHRX_DSCRERR _SB_MAKEMASK1(52) |
284 | 284 | ||
285 | #if SIBYTE_HDR_FEATURE(1250, PASS2) || SIBYTE_HDR_FEATURE(112x, PASS1) | 285 | #if SIBYTE_HDR_FEATURE(1250, PASS2) || SIBYTE_HDR_FEATURE(112x, PASS1) |
286 | /* Note: BADTCPCS is actually in DSCR_B options field */ | 286 | /* Note: BADTCPCS is actually in DSCR_B options field */ |
287 | #define M_DMA_ETHRX_BADTCPCS _SB_MAKEMASK1(0) | 287 | #define M_DMA_ETHRX_BADTCPCS _SB_MAKEMASK1(0) |
288 | #endif /* 1250 PASS2 || 112x PASS1 */ | 288 | #endif /* 1250 PASS2 || 112x PASS1 */ |
@@ -324,7 +324,7 @@ | |||
324 | 324 | ||
325 | #define M_DMA_ETHTX_SOP _SB_MAKEMASK1(63) | 325 | #define M_DMA_ETHTX_SOP _SB_MAKEMASK1(63) |
326 | 326 | ||
327 | /* | 327 | /* |
328 | * Ethernet Transmit Options (Table 7-17) | 328 | * Ethernet Transmit Options (Table 7-17) |
329 | */ | 329 | */ |
330 | 330 | ||
@@ -377,7 +377,7 @@ | |||
377 | * Data Mover Registers | 377 | * Data Mover Registers |
378 | ********************************************************************* */ | 378 | ********************************************************************* */ |
379 | 379 | ||
380 | /* | 380 | /* |
381 | * Data Mover Descriptor Base Address Register (Table 7-22) | 381 | * Data Mover Descriptor Base Address Register (Table 7-22) |
382 | * Register: DM_DSCR_BASE_0 | 382 | * Register: DM_DSCR_BASE_0 |
383 | * Register: DM_DSCR_BASE_1 | 383 | * Register: DM_DSCR_BASE_1 |
@@ -414,7 +414,7 @@ | |||
414 | #define M_DM_DSCR_BASE_ABORT _SB_MAKEMASK1(62) | 414 | #define M_DM_DSCR_BASE_ABORT _SB_MAKEMASK1(62) |
415 | #define M_DM_DSCR_BASE_ENABL _SB_MAKEMASK1(63) | 415 | #define M_DM_DSCR_BASE_ENABL _SB_MAKEMASK1(63) |
416 | 416 | ||
417 | /* | 417 | /* |
418 | * Data Mover Descriptor Count Register (Table 7-25) | 418 | * Data Mover Descriptor Count Register (Table 7-25) |
419 | */ | 419 | */ |
420 | 420 | ||
diff --git a/include/asm-mips/sibyte/sb1250_genbus.h b/include/asm-mips/sibyte/sb1250_genbus.h index 0d9dfac3d7db..f1f509f295c4 100644 --- a/include/asm-mips/sibyte/sb1250_genbus.h +++ b/include/asm-mips/sibyte/sb1250_genbus.h | |||
@@ -1,23 +1,23 @@ | |||
1 | /* ********************************************************************* | 1 | /* ********************************************************************* |
2 | * SB1250 Board Support Package | 2 | * SB1250 Board Support Package |
3 | * | 3 | * |
4 | * Generic Bus Constants File: sb1250_genbus.h | 4 | * Generic Bus Constants File: sb1250_genbus.h |
5 | * | 5 | * |
6 | * This module contains constants and macros useful for | 6 | * This module contains constants and macros useful for |
7 | * manipulating the SB1250's Generic Bus interface | 7 | * manipulating the SB1250's Generic Bus interface |
8 | * | 8 | * |
9 | * SB1250 specification level: User's manual 1/02/02 | 9 | * SB1250 specification level: User's manual 1/02/02 |
10 | * | 10 | * |
11 | * Author: Mitch Lichtenberg | 11 | * Author: Mitch Lichtenberg |
12 | * | 12 | * |
13 | ********************************************************************* | 13 | ********************************************************************* |
14 | * | 14 | * |
15 | * Copyright 2000,2001,2002,2003 | 15 | * Copyright 2000,2001,2002,2003 |
16 | * Broadcom Corporation. All rights reserved. | 16 | * Broadcom Corporation. All rights reserved. |
17 | * | 17 | * |
18 | * This program is free software; you can redistribute it and/or | 18 | * This program is free software; you can redistribute it and/or |
19 | * modify it under the terms of the GNU General Public License as | 19 | * modify it under the terms of the GNU General Public License as |
20 | * published by the Free Software Foundation; either version 2 of | 20 | * published by the Free Software Foundation; either version 2 of |
21 | * the License, or (at your option) any later version. | 21 | * the License, or (at your option) any later version. |
22 | * | 22 | * |
23 | * This program is distributed in the hope that it will be useful, | 23 | * This program is distributed in the hope that it will be useful, |
@@ -27,7 +27,7 @@ | |||
27 | * | 27 | * |
28 | * You should have received a copy of the GNU General Public License | 28 | * You should have received a copy of the GNU General Public License |
29 | * along with this program; if not, write to the Free Software | 29 | * along with this program; if not, write to the Free Software |
30 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, | 30 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, |
31 | * MA 02111-1307 USA | 31 | * MA 02111-1307 USA |
32 | ********************************************************************* */ | 32 | ********************************************************************* */ |
33 | 33 | ||
diff --git a/include/asm-mips/sibyte/sb1250_int.h b/include/asm-mips/sibyte/sb1250_int.h index c3f74df211f4..e173e2ea4c98 100644 --- a/include/asm-mips/sibyte/sb1250_int.h +++ b/include/asm-mips/sibyte/sb1250_int.h | |||
@@ -1,23 +1,23 @@ | |||
1 | /* ********************************************************************* | 1 | /* ********************************************************************* |
2 | * SB1250 Board Support Package | 2 | * SB1250 Board Support Package |
3 | * | 3 | * |
4 | * Interrupt Mapper definitions File: sb1250_int.h | 4 | * Interrupt Mapper definitions File: sb1250_int.h |
5 | * | 5 | * |
6 | * This module contains constants for manipulating the SB1250's | 6 | * This module contains constants for manipulating the SB1250's |
7 | * interrupt mapper and definitions for the interrupt sources. | 7 | * interrupt mapper and definitions for the interrupt sources. |
8 | * | 8 | * |
9 | * SB1250 specification level: User's manual 1/02/02 | 9 | * SB1250 specification level: User's manual 1/02/02 |
10 | * | 10 | * |
11 | * Author: Mitch Lichtenberg | 11 | * Author: Mitch Lichtenberg |
12 | * | 12 | * |
13 | ********************************************************************* | 13 | ********************************************************************* |
14 | * | 14 | * |
15 | * Copyright 2000,2001,2002,2003 | 15 | * Copyright 2000,2001,2002,2003 |
16 | * Broadcom Corporation. All rights reserved. | 16 | * Broadcom Corporation. All rights reserved. |
17 | * | 17 | * |
18 | * This program is free software; you can redistribute it and/or | 18 | * This program is free software; you can redistribute it and/or |
19 | * modify it under the terms of the GNU General Public License as | 19 | * modify it under the terms of the GNU General Public License as |
20 | * published by the Free Software Foundation; either version 2 of | 20 | * published by the Free Software Foundation; either version 2 of |
21 | * the License, or (at your option) any later version. | 21 | * the License, or (at your option) any later version. |
22 | * | 22 | * |
23 | * This program is distributed in the hope that it will be useful, | 23 | * This program is distributed in the hope that it will be useful, |
@@ -27,7 +27,7 @@ | |||
27 | * | 27 | * |
28 | * You should have received a copy of the GNU General Public License | 28 | * You should have received a copy of the GNU General Public License |
29 | * along with this program; if not, write to the Free Software | 29 | * along with this program; if not, write to the Free Software |
30 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, | 30 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, |
31 | * MA 02111-1307 USA | 31 | * MA 02111-1307 USA |
32 | ********************************************************************* */ | 32 | ********************************************************************* */ |
33 | 33 | ||
@@ -43,7 +43,7 @@ | |||
43 | 43 | ||
44 | /* | 44 | /* |
45 | * Interrupt sources (Table 4-8, UM 0.2) | 45 | * Interrupt sources (Table 4-8, UM 0.2) |
46 | * | 46 | * |
47 | * First, the interrupt numbers. | 47 | * First, the interrupt numbers. |
48 | */ | 48 | */ |
49 | 49 | ||
diff --git a/include/asm-mips/sibyte/sb1250_l2c.h b/include/asm-mips/sibyte/sb1250_l2c.h index 799db828d963..8afe8e01581b 100644 --- a/include/asm-mips/sibyte/sb1250_l2c.h +++ b/include/asm-mips/sibyte/sb1250_l2c.h | |||
@@ -1,23 +1,23 @@ | |||
1 | /* ********************************************************************* | 1 | /* ********************************************************************* |
2 | * SB1250 Board Support Package | 2 | * SB1250 Board Support Package |
3 | * | 3 | * |
4 | * L2 Cache constants and macros File: sb1250_l2c.h | 4 | * L2 Cache constants and macros File: sb1250_l2c.h |
5 | * | 5 | * |
6 | * This module contains constants useful for manipulating the | 6 | * This module contains constants useful for manipulating the |
7 | * level 2 cache. | 7 | * level 2 cache. |
8 | * | 8 | * |
9 | * SB1250 specification level: User's manual 1/02/02 | 9 | * SB1250 specification level: User's manual 1/02/02 |
10 | * | 10 | * |
11 | * Author: Mitch Lichtenberg | 11 | * Author: Mitch Lichtenberg |
12 | * | 12 | * |
13 | ********************************************************************* | 13 | ********************************************************************* |
14 | * | 14 | * |
15 | * Copyright 2000,2001,2002,2003 | 15 | * Copyright 2000,2001,2002,2003 |
16 | * Broadcom Corporation. All rights reserved. | 16 | * Broadcom Corporation. All rights reserved. |
17 | * | 17 | * |
18 | * This program is free software; you can redistribute it and/or | 18 | * This program is free software; you can redistribute it and/or |
19 | * modify it under the terms of the GNU General Public License as | 19 | * modify it under the terms of the GNU General Public License as |
20 | * published by the Free Software Foundation; either version 2 of | 20 | * published by the Free Software Foundation; either version 2 of |
21 | * the License, or (at your option) any later version. | 21 | * the License, or (at your option) any later version. |
22 | * | 22 | * |
23 | * This program is distributed in the hope that it will be useful, | 23 | * This program is distributed in the hope that it will be useful, |
@@ -27,7 +27,7 @@ | |||
27 | * | 27 | * |
28 | * You should have received a copy of the GNU General Public License | 28 | * You should have received a copy of the GNU General Public License |
29 | * along with this program; if not, write to the Free Software | 29 | * along with this program; if not, write to the Free Software |
30 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, | 30 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, |
31 | * MA 02111-1307 USA | 31 | * MA 02111-1307 USA |
32 | ********************************************************************* */ | 32 | ********************************************************************* */ |
33 | 33 | ||
diff --git a/include/asm-mips/sibyte/sb1250_ldt.h b/include/asm-mips/sibyte/sb1250_ldt.h index d8753885df17..f2617ded0a8f 100644 --- a/include/asm-mips/sibyte/sb1250_ldt.h +++ b/include/asm-mips/sibyte/sb1250_ldt.h | |||
@@ -1,23 +1,23 @@ | |||
1 | /* ********************************************************************* | 1 | /* ********************************************************************* |
2 | * SB1250 Board Support Package | 2 | * SB1250 Board Support Package |
3 | * | 3 | * |
4 | * LDT constants File: sb1250_ldt.h | 4 | * LDT constants File: sb1250_ldt.h |
5 | * | 5 | * |
6 | * This module contains constants and macros to describe | 6 | * This module contains constants and macros to describe |
7 | * the LDT interface on the SB1250. | 7 | * the LDT interface on the SB1250. |
8 | * | 8 | * |
9 | * SB1250 specification level: User's manual 1/02/02 | 9 | * SB1250 specification level: User's manual 1/02/02 |
10 | * | 10 | * |
11 | * Author: Mitch Lichtenberg | 11 | * Author: Mitch Lichtenberg |
12 | * | 12 | * |
13 | ********************************************************************* | 13 | ********************************************************************* |
14 | * | 14 | * |
15 | * Copyright 2000,2001,2002,2003 | 15 | * Copyright 2000,2001,2002,2003 |
16 | * Broadcom Corporation. All rights reserved. | 16 | * Broadcom Corporation. All rights reserved. |
17 | * | 17 | * |
18 | * This program is free software; you can redistribute it and/or | 18 | * This program is free software; you can redistribute it and/or |
19 | * modify it under the terms of the GNU General Public License as | 19 | * modify it under the terms of the GNU General Public License as |
20 | * published by the Free Software Foundation; either version 2 of | 20 | * published by the Free Software Foundation; either version 2 of |
21 | * the License, or (at your option) any later version. | 21 | * the License, or (at your option) any later version. |
22 | * | 22 | * |
23 | * This program is distributed in the hope that it will be useful, | 23 | * This program is distributed in the hope that it will be useful, |
@@ -27,7 +27,7 @@ | |||
27 | * | 27 | * |
28 | * You should have received a copy of the GNU General Public License | 28 | * You should have received a copy of the GNU General Public License |
29 | * along with this program; if not, write to the Free Software | 29 | * along with this program; if not, write to the Free Software |
30 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, | 30 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, |
31 | * MA 02111-1307 USA | 31 | * MA 02111-1307 USA |
32 | ********************************************************************* */ | 32 | ********************************************************************* */ |
33 | 33 | ||
@@ -155,7 +155,7 @@ | |||
155 | 155 | ||
156 | /* | 156 | /* |
157 | * LDT Status Register (Table 8-14). Note that these constants | 157 | * LDT Status Register (Table 8-14). Note that these constants |
158 | * assume you've read the command and status register | 158 | * assume you've read the command and status register |
159 | * together (32-bit read at offset 0x04) | 159 | * together (32-bit read at offset 0x04) |
160 | * | 160 | * |
161 | * These bits also apply to the secondary status | 161 | * These bits also apply to the secondary status |
@@ -183,8 +183,8 @@ | |||
183 | #define M_LDT_STATUS_DETPARERR _SB_MAKEMASK1_32(31) | 183 | #define M_LDT_STATUS_DETPARERR _SB_MAKEMASK1_32(31) |
184 | 184 | ||
185 | /* | 185 | /* |
186 | * Bridge Control Register (Table 8-16). Note that these | 186 | * Bridge Control Register (Table 8-16). Note that these |
187 | * constants assume you've read the register as a 32-bit | 187 | * constants assume you've read the register as a 32-bit |
188 | * read (offset 0x3C) | 188 | * read (offset 0x3C) |
189 | */ | 189 | */ |
190 | 190 | ||
diff --git a/include/asm-mips/sibyte/sb1250_mac.h b/include/asm-mips/sibyte/sb1250_mac.h index 81f603f03a98..18e74e43f4a2 100644 --- a/include/asm-mips/sibyte/sb1250_mac.h +++ b/include/asm-mips/sibyte/sb1250_mac.h | |||
@@ -1,23 +1,23 @@ | |||
1 | /* ********************************************************************* | 1 | /* ********************************************************************* |
2 | * SB1250 Board Support Package | 2 | * SB1250 Board Support Package |
3 | * | 3 | * |
4 | * MAC constants and macros File: sb1250_mac.h | 4 | * MAC constants and macros File: sb1250_mac.h |
5 | * | 5 | * |
6 | * This module contains constants and macros for the SB1250's | 6 | * This module contains constants and macros for the SB1250's |
7 | * ethernet controllers. | 7 | * ethernet controllers. |
8 | * | 8 | * |
9 | * SB1250 specification level: User's manual 1/02/02 | 9 | * SB1250 specification level: User's manual 1/02/02 |
10 | * | 10 | * |
11 | * Author: Mitch Lichtenberg | 11 | * Author: Mitch Lichtenberg |
12 | * | 12 | * |
13 | ********************************************************************* | 13 | ********************************************************************* |
14 | * | 14 | * |
15 | * Copyright 2000,2001,2002,2003 | 15 | * Copyright 2000,2001,2002,2003 |
16 | * Broadcom Corporation. All rights reserved. | 16 | * Broadcom Corporation. All rights reserved. |
17 | * | 17 | * |
18 | * This program is free software; you can redistribute it and/or | 18 | * This program is free software; you can redistribute it and/or |
19 | * modify it under the terms of the GNU General Public License as | 19 | * modify it under the terms of the GNU General Public License as |
20 | * published by the Free Software Foundation; either version 2 of | 20 | * published by the Free Software Foundation; either version 2 of |
21 | * the License, or (at your option) any later version. | 21 | * the License, or (at your option) any later version. |
22 | * | 22 | * |
23 | * This program is distributed in the hope that it will be useful, | 23 | * This program is distributed in the hope that it will be useful, |
@@ -27,7 +27,7 @@ | |||
27 | * | 27 | * |
28 | * You should have received a copy of the GNU General Public License | 28 | * You should have received a copy of the GNU General Public License |
29 | * along with this program; if not, write to the Free Software | 29 | * along with this program; if not, write to the Free Software |
30 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, | 30 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, |
31 | * MA 02111-1307 USA | 31 | * MA 02111-1307 USA |
32 | ********************************************************************* */ | 32 | ********************************************************************* */ |
33 | 33 | ||
@@ -311,7 +311,7 @@ | |||
311 | 311 | ||
312 | /* | 312 | /* |
313 | * These constants are used to configure the fields within the Frame | 313 | * These constants are used to configure the fields within the Frame |
314 | * Configuration Register. | 314 | * Configuration Register. |
315 | */ | 315 | */ |
316 | 316 | ||
317 | #define K_MAC_IFG_RX_10 _SB_MAKE64(0) /* See table 176, not used */ | 317 | #define K_MAC_IFG_RX_10 _SB_MAKE64(0) /* See table 176, not used */ |
@@ -393,7 +393,7 @@ | |||
393 | * Register: MAC_INT_MASK_2 | 393 | * Register: MAC_INT_MASK_2 |
394 | */ | 394 | */ |
395 | 395 | ||
396 | /* | 396 | /* |
397 | * Use these constants to shift the appropriate channel | 397 | * Use these constants to shift the appropriate channel |
398 | * into the CH0 position so the same tests can be used | 398 | * into the CH0 position so the same tests can be used |
399 | * on each channel. | 399 | * on each channel. |
diff --git a/include/asm-mips/sibyte/sb1250_mc.h b/include/asm-mips/sibyte/sb1250_mc.h index 93a48334b874..1dd41c927996 100644 --- a/include/asm-mips/sibyte/sb1250_mc.h +++ b/include/asm-mips/sibyte/sb1250_mc.h | |||
@@ -1,23 +1,23 @@ | |||
1 | /* ********************************************************************* | 1 | /* ********************************************************************* |
2 | * SB1250 Board Support Package | 2 | * SB1250 Board Support Package |
3 | * | 3 | * |
4 | * Memory Controller constants File: sb1250_mc.h | 4 | * Memory Controller constants File: sb1250_mc.h |
5 | * | 5 | * |
6 | * This module contains constants and macros useful for | 6 | * This module contains constants and macros useful for |
7 | * programming the memory controller. | 7 | * programming the memory controller. |
8 | * | 8 | * |
9 | * SB1250 specification level: User's manual 1/02/02 | 9 | * SB1250 specification level: User's manual 1/02/02 |
10 | * | 10 | * |
11 | * Author: Mitch Lichtenberg | 11 | * Author: Mitch Lichtenberg |
12 | * | 12 | * |
13 | ********************************************************************* | 13 | ********************************************************************* |
14 | * | 14 | * |
15 | * Copyright 2000,2001,2002,2003 | 15 | * Copyright 2000,2001,2002,2003 |
16 | * Broadcom Corporation. All rights reserved. | 16 | * Broadcom Corporation. All rights reserved. |
17 | * | 17 | * |
18 | * This program is free software; you can redistribute it and/or | 18 | * This program is free software; you can redistribute it and/or |
19 | * modify it under the terms of the GNU General Public License as | 19 | * modify it under the terms of the GNU General Public License as |
20 | * published by the Free Software Foundation; either version 2 of | 20 | * published by the Free Software Foundation; either version 2 of |
21 | * the License, or (at your option) any later version. | 21 | * the License, or (at your option) any later version. |
22 | * | 22 | * |
23 | * This program is distributed in the hope that it will be useful, | 23 | * This program is distributed in the hope that it will be useful, |
@@ -27,7 +27,7 @@ | |||
27 | * | 27 | * |
28 | * You should have received a copy of the GNU General Public License | 28 | * You should have received a copy of the GNU General Public License |
29 | * along with this program; if not, write to the Free Software | 29 | * along with this program; if not, write to the Free Software |
30 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, | 30 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, |
31 | * MA 02111-1307 USA | 31 | * MA 02111-1307 USA |
32 | ********************************************************************* */ | 32 | ********************************************************************* */ |
33 | 33 | ||
@@ -166,7 +166,7 @@ | |||
166 | 166 | ||
167 | #define K_MC_REF_RATE_100MHz 0x62 | 167 | #define K_MC_REF_RATE_100MHz 0x62 |
168 | #define K_MC_REF_RATE_133MHz 0x81 | 168 | #define K_MC_REF_RATE_133MHz 0x81 |
169 | #define K_MC_REF_RATE_200MHz 0xC4 | 169 | #define K_MC_REF_RATE_200MHz 0xC4 |
170 | 170 | ||
171 | #define V_MC_REF_RATE_100MHz V_MC_REF_RATE(K_MC_REF_RATE_100MHz) | 171 | #define V_MC_REF_RATE_100MHz V_MC_REF_RATE(K_MC_REF_RATE_100MHz) |
172 | #define V_MC_REF_RATE_133MHz V_MC_REF_RATE(K_MC_REF_RATE_133MHz) | 172 | #define V_MC_REF_RATE_133MHz V_MC_REF_RATE(K_MC_REF_RATE_133MHz) |
@@ -228,7 +228,7 @@ | |||
228 | V_MC_ADDR_DRIVE_DEFAULT | \ | 228 | V_MC_ADDR_DRIVE_DEFAULT | \ |
229 | V_MC_DATA_DRIVE_DEFAULT | \ | 229 | V_MC_DATA_DRIVE_DEFAULT | \ |
230 | V_MC_CLOCK_DRIVE_DEFAULT | \ | 230 | V_MC_CLOCK_DRIVE_DEFAULT | \ |
231 | V_MC_REF_RATE_DEFAULT | 231 | V_MC_REF_RATE_DEFAULT |
232 | 232 | ||
233 | 233 | ||
234 | 234 | ||
diff --git a/include/asm-mips/sibyte/sb1250_regs.h b/include/asm-mips/sibyte/sb1250_regs.h index 5d496c6faba6..9db80cd13a79 100644 --- a/include/asm-mips/sibyte/sb1250_regs.h +++ b/include/asm-mips/sibyte/sb1250_regs.h | |||
@@ -1,23 +1,23 @@ | |||
1 | /* ********************************************************************* | 1 | /* ********************************************************************* |
2 | * SB1250 Board Support Package | 2 | * SB1250 Board Support Package |
3 | * | 3 | * |
4 | * Register Definitions File: sb1250_regs.h | 4 | * Register Definitions File: sb1250_regs.h |
5 | * | 5 | * |
6 | * This module contains the addresses of the on-chip peripherals | 6 | * This module contains the addresses of the on-chip peripherals |
7 | * on the SB1250. | 7 | * on the SB1250. |
8 | * | 8 | * |
9 | * SB1250 specification level: 01/02/2002 | 9 | * SB1250 specification level: 01/02/2002 |
10 | * | 10 | * |
11 | * Author: Mitch Lichtenberg | 11 | * Author: Mitch Lichtenberg |
12 | * | 12 | * |
13 | ********************************************************************* | 13 | ********************************************************************* |
14 | * | 14 | * |
15 | * Copyright 2000,2001,2002,2003 | 15 | * Copyright 2000,2001,2002,2003 |
16 | * Broadcom Corporation. All rights reserved. | 16 | * Broadcom Corporation. All rights reserved. |
17 | * | 17 | * |
18 | * This program is free software; you can redistribute it and/or | 18 | * This program is free software; you can redistribute it and/or |
19 | * modify it under the terms of the GNU General Public License as | 19 | * modify it under the terms of the GNU General Public License as |
20 | * published by the Free Software Foundation; either version 2 of | 20 | * published by the Free Software Foundation; either version 2 of |
21 | * the License, or (at your option) any later version. | 21 | * the License, or (at your option) any later version. |
22 | * | 22 | * |
23 | * This program is distributed in the hope that it will be useful, | 23 | * This program is distributed in the hope that it will be useful, |
@@ -27,7 +27,7 @@ | |||
27 | * | 27 | * |
28 | * You should have received a copy of the GNU General Public License | 28 | * You should have received a copy of the GNU General Public License |
29 | * along with this program; if not, write to the Free Software | 29 | * along with this program; if not, write to the Free Software |
30 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, | 30 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, |
31 | * MA 02111-1307 USA | 31 | * MA 02111-1307 USA |
32 | ********************************************************************* */ | 32 | ********************************************************************* */ |
33 | 33 | ||
@@ -40,20 +40,20 @@ | |||
40 | 40 | ||
41 | /* ********************************************************************* | 41 | /* ********************************************************************* |
42 | * Some general notes: | 42 | * Some general notes: |
43 | * | 43 | * |
44 | * For the most part, when there is more than one peripheral | 44 | * For the most part, when there is more than one peripheral |
45 | * of the same type on the SOC, the constants below will be | 45 | * of the same type on the SOC, the constants below will be |
46 | * offsets from the base of each peripheral. For example, | 46 | * offsets from the base of each peripheral. For example, |
47 | * the MAC registers are described as offsets from the first | 47 | * the MAC registers are described as offsets from the first |
48 | * MAC register, and there will be a MAC_REGISTER() macro | 48 | * MAC register, and there will be a MAC_REGISTER() macro |
49 | * to calculate the base address of a given MAC. | 49 | * to calculate the base address of a given MAC. |
50 | * | 50 | * |
51 | * The information in this file is based on the SB1250 SOC | 51 | * The information in this file is based on the SB1250 SOC |
52 | * manual version 0.2, July 2000. | 52 | * manual version 0.2, July 2000. |
53 | ********************************************************************* */ | 53 | ********************************************************************* */ |
54 | 54 | ||
55 | 55 | ||
56 | /* ********************************************************************* | 56 | /* ********************************************************************* |
57 | * Memory Controller Registers | 57 | * Memory Controller Registers |
58 | ********************************************************************* */ | 58 | ********************************************************************* */ |
59 | 59 | ||
@@ -101,7 +101,7 @@ | |||
101 | #define R_MC_TEST_ECC 0x0000000420 | 101 | #define R_MC_TEST_ECC 0x0000000420 |
102 | #define R_MC_MCLK_CFG 0x0000000500 | 102 | #define R_MC_MCLK_CFG 0x0000000500 |
103 | 103 | ||
104 | /* ********************************************************************* | 104 | /* ********************************************************************* |
105 | * L2 Cache Control Registers | 105 | * L2 Cache Control Registers |
106 | ********************************************************************* */ | 106 | ********************************************************************* */ |
107 | 107 | ||
@@ -126,7 +126,7 @@ | |||
126 | #define A_L2_EEC_ADDRESS A_L2_ECC_TAG | 126 | #define A_L2_EEC_ADDRESS A_L2_ECC_TAG |
127 | 127 | ||
128 | 128 | ||
129 | /* ********************************************************************* | 129 | /* ********************************************************************* |
130 | * PCI Interface Registers | 130 | * PCI Interface Registers |
131 | ********************************************************************* */ | 131 | ********************************************************************* */ |
132 | 132 | ||
@@ -134,7 +134,7 @@ | |||
134 | #define A_PCI_TYPE01_HEADER 0x00DE000800 | 134 | #define A_PCI_TYPE01_HEADER 0x00DE000800 |
135 | 135 | ||
136 | 136 | ||
137 | /* ********************************************************************* | 137 | /* ********************************************************************* |
138 | * Ethernet DMA and MACs | 138 | * Ethernet DMA and MACs |
139 | ********************************************************************* */ | 139 | ********************************************************************* */ |
140 | 140 | ||
@@ -184,7 +184,7 @@ | |||
184 | (R_MAC_DMA_CHANNEL_BASE(txrx,chan) + \ | 184 | (R_MAC_DMA_CHANNEL_BASE(txrx,chan) + \ |
185 | (reg)) | 185 | (reg)) |
186 | 186 | ||
187 | /* | 187 | /* |
188 | * DMA channel registers, relative to A_MAC_DMA_CHANNEL_BASE | 188 | * DMA channel registers, relative to A_MAC_DMA_CHANNEL_BASE |
189 | */ | 189 | */ |
190 | 190 | ||
@@ -259,7 +259,7 @@ | |||
259 | #define MAC_CHMAP_COUNT 4 | 259 | #define MAC_CHMAP_COUNT 4 |
260 | 260 | ||
261 | 261 | ||
262 | /* ********************************************************************* | 262 | /* ********************************************************************* |
263 | * DUART Registers | 263 | * DUART Registers |
264 | ********************************************************************* */ | 264 | ********************************************************************* */ |
265 | 265 | ||
@@ -363,7 +363,7 @@ | |||
363 | #endif /* 1250 PASS2 || 112x PASS1 */ | 363 | #endif /* 1250 PASS2 || 112x PASS1 */ |
364 | 364 | ||
365 | 365 | ||
366 | /* ********************************************************************* | 366 | /* ********************************************************************* |
367 | * Synchronous Serial Registers | 367 | * Synchronous Serial Registers |
368 | ********************************************************************* */ | 368 | ********************************************************************* */ |
369 | 369 | ||
@@ -397,7 +397,7 @@ | |||
397 | (reg)) | 397 | (reg)) |
398 | 398 | ||
399 | 399 | ||
400 | /* | 400 | /* |
401 | * DMA channel registers, relative to A_SER_DMA_CHANNEL_BASE | 401 | * DMA channel registers, relative to A_SER_DMA_CHANNEL_BASE |
402 | */ | 402 | */ |
403 | 403 | ||
@@ -457,7 +457,7 @@ | |||
457 | #define R_SER_RMON_RX_ERRORS 0x000001F0 | 457 | #define R_SER_RMON_RX_ERRORS 0x000001F0 |
458 | #define R_SER_RMON_RX_BADADDR 0x000001F8 | 458 | #define R_SER_RMON_RX_BADADDR 0x000001F8 |
459 | 459 | ||
460 | /* ********************************************************************* | 460 | /* ********************************************************************* |
461 | * Generic Bus Registers | 461 | * Generic Bus Registers |
462 | ********************************************************************* */ | 462 | ********************************************************************* */ |
463 | 463 | ||
@@ -513,7 +513,7 @@ | |||
513 | #define R_IO_PCMCIA_CFG 0x0A60 | 513 | #define R_IO_PCMCIA_CFG 0x0A60 |
514 | #define R_IO_PCMCIA_STATUS 0x0A70 | 514 | #define R_IO_PCMCIA_STATUS 0x0A70 |
515 | 515 | ||
516 | /* ********************************************************************* | 516 | /* ********************************************************************* |
517 | * GPIO Registers | 517 | * GPIO Registers |
518 | ********************************************************************* */ | 518 | ********************************************************************* */ |
519 | 519 | ||
@@ -537,7 +537,7 @@ | |||
537 | #define R_GPIO_PIN_CLR 0x30 | 537 | #define R_GPIO_PIN_CLR 0x30 |
538 | #define R_GPIO_PIN_SET 0x38 | 538 | #define R_GPIO_PIN_SET 0x38 |
539 | 539 | ||
540 | /* ********************************************************************* | 540 | /* ********************************************************************* |
541 | * SMBus Registers | 541 | * SMBus Registers |
542 | ********************************************************************* */ | 542 | ********************************************************************* */ |
543 | 543 | ||
@@ -573,7 +573,7 @@ | |||
573 | #define R_SMB_CONTROL 0x0000000060 | 573 | #define R_SMB_CONTROL 0x0000000060 |
574 | #define R_SMB_PEC 0x0000000070 | 574 | #define R_SMB_PEC 0x0000000070 |
575 | 575 | ||
576 | /* ********************************************************************* | 576 | /* ********************************************************************* |
577 | * Timer Registers | 577 | * Timer Registers |
578 | ********************************************************************* */ | 578 | ********************************************************************* */ |
579 | 579 | ||
@@ -641,7 +641,7 @@ | |||
641 | #endif /* 1250 PASS2 || 112x PASS1 */ | 641 | #endif /* 1250 PASS2 || 112x PASS1 */ |
642 | 642 | ||
643 | 643 | ||
644 | /* ********************************************************************* | 644 | /* ********************************************************************* |
645 | * System Control Registers | 645 | * System Control Registers |
646 | ********************************************************************* */ | 646 | ********************************************************************* */ |
647 | 647 | ||
@@ -649,7 +649,7 @@ | |||
649 | #define A_SCD_SYSTEM_CFG 0x0010020008 | 649 | #define A_SCD_SYSTEM_CFG 0x0010020008 |
650 | #define A_SCD_SYSTEM_MANUF 0x0010038000 | 650 | #define A_SCD_SYSTEM_MANUF 0x0010038000 |
651 | 651 | ||
652 | /* ********************************************************************* | 652 | /* ********************************************************************* |
653 | * System Address Trap Registers | 653 | * System Address Trap Registers |
654 | ********************************************************************* */ | 654 | ********************************************************************* */ |
655 | 655 | ||
@@ -672,7 +672,7 @@ | |||
672 | #endif /* 1250 PASS2 || 112x PASS1 */ | 672 | #endif /* 1250 PASS2 || 112x PASS1 */ |
673 | 673 | ||
674 | 674 | ||
675 | /* ********************************************************************* | 675 | /* ********************************************************************* |
676 | * System Interrupt Mapper Registers | 676 | * System Interrupt Mapper Registers |
677 | ********************************************************************* */ | 677 | ********************************************************************* */ |
678 | 678 | ||
@@ -701,7 +701,7 @@ | |||
701 | #define R_IMR_INTERRUPT_MAP_BASE 0x0200 | 701 | #define R_IMR_INTERRUPT_MAP_BASE 0x0200 |
702 | #define R_IMR_INTERRUPT_MAP_COUNT 64 | 702 | #define R_IMR_INTERRUPT_MAP_COUNT 64 |
703 | 703 | ||
704 | /* ********************************************************************* | 704 | /* ********************************************************************* |
705 | * System Performance Counter Registers | 705 | * System Performance Counter Registers |
706 | ********************************************************************* */ | 706 | ********************************************************************* */ |
707 | 707 | ||
@@ -711,7 +711,7 @@ | |||
711 | #define A_SCD_PERF_CNT_2 0x00100204E0 | 711 | #define A_SCD_PERF_CNT_2 0x00100204E0 |
712 | #define A_SCD_PERF_CNT_3 0x00100204E8 | 712 | #define A_SCD_PERF_CNT_3 0x00100204E8 |
713 | 713 | ||
714 | /* ********************************************************************* | 714 | /* ********************************************************************* |
715 | * System Bus Watcher Registers | 715 | * System Bus Watcher Registers |
716 | ********************************************************************* */ | 716 | ********************************************************************* */ |
717 | 717 | ||
@@ -726,13 +726,13 @@ | |||
726 | #define A_BUS_L2_ERRORS 0x00100208C0 | 726 | #define A_BUS_L2_ERRORS 0x00100208C0 |
727 | #define A_BUS_MEM_IO_ERRORS 0x00100208C8 | 727 | #define A_BUS_MEM_IO_ERRORS 0x00100208C8 |
728 | 728 | ||
729 | /* ********************************************************************* | 729 | /* ********************************************************************* |
730 | * System Debug Controller Registers | 730 | * System Debug Controller Registers |
731 | ********************************************************************* */ | 731 | ********************************************************************* */ |
732 | 732 | ||
733 | #define A_SCD_JTAG_BASE 0x0010000000 | 733 | #define A_SCD_JTAG_BASE 0x0010000000 |
734 | 734 | ||
735 | /* ********************************************************************* | 735 | /* ********************************************************************* |
736 | * System Trace Buffer Registers | 736 | * System Trace Buffer Registers |
737 | ********************************************************************* */ | 737 | ********************************************************************* */ |
738 | 738 | ||
@@ -755,7 +755,7 @@ | |||
755 | #define A_SCD_TRACE_SEQUENCE_6 0x0010020A90 | 755 | #define A_SCD_TRACE_SEQUENCE_6 0x0010020A90 |
756 | #define A_SCD_TRACE_SEQUENCE_7 0x0010020A98 | 756 | #define A_SCD_TRACE_SEQUENCE_7 0x0010020A98 |
757 | 757 | ||
758 | /* ********************************************************************* | 758 | /* ********************************************************************* |
759 | * System Generic DMA Registers | 759 | * System Generic DMA Registers |
760 | ********************************************************************* */ | 760 | ********************************************************************* */ |
761 | 761 | ||
diff --git a/include/asm-mips/sibyte/sb1250_scd.h b/include/asm-mips/sibyte/sb1250_scd.h index 22e8041959e2..dbbd682fb47e 100644 --- a/include/asm-mips/sibyte/sb1250_scd.h +++ b/include/asm-mips/sibyte/sb1250_scd.h | |||
@@ -1,23 +1,23 @@ | |||
1 | /* ********************************************************************* | 1 | /* ********************************************************************* |
2 | * SB1250 Board Support Package | 2 | * SB1250 Board Support Package |
3 | * | 3 | * |
4 | * SCD Constants and Macros File: sb1250_scd.h | 4 | * SCD Constants and Macros File: sb1250_scd.h |
5 | * | 5 | * |
6 | * This module contains constants and macros useful for | 6 | * This module contains constants and macros useful for |
7 | * manipulating the System Control and Debug module on the 1250. | 7 | * manipulating the System Control and Debug module on the 1250. |
8 | * | 8 | * |
9 | * SB1250 specification level: User's manual 1/02/02 | 9 | * SB1250 specification level: User's manual 1/02/02 |
10 | * | 10 | * |
11 | * Author: Mitch Lichtenberg | 11 | * Author: Mitch Lichtenberg |
12 | * | 12 | * |
13 | ********************************************************************* | 13 | ********************************************************************* |
14 | * | 14 | * |
15 | * Copyright 2000,2001,2002,2003 | 15 | * Copyright 2000,2001,2002,2003 |
16 | * Broadcom Corporation. All rights reserved. | 16 | * Broadcom Corporation. All rights reserved. |
17 | * | 17 | * |
18 | * This program is free software; you can redistribute it and/or | 18 | * This program is free software; you can redistribute it and/or |
19 | * modify it under the terms of the GNU General Public License as | 19 | * modify it under the terms of the GNU General Public License as |
20 | * published by the Free Software Foundation; either version 2 of | 20 | * published by the Free Software Foundation; either version 2 of |
21 | * the License, or (at your option) any later version. | 21 | * the License, or (at your option) any later version. |
22 | * | 22 | * |
23 | * This program is distributed in the hope that it will be useful, | 23 | * This program is distributed in the hope that it will be useful, |
@@ -27,7 +27,7 @@ | |||
27 | * | 27 | * |
28 | * You should have received a copy of the GNU General Public License | 28 | * You should have received a copy of the GNU General Public License |
29 | * along with this program; if not, write to the Free Software | 29 | * along with this program; if not, write to the Free Software |
30 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, | 30 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, |
31 | * MA 02111-1307 USA | 31 | * MA 02111-1307 USA |
32 | ********************************************************************* */ | 32 | ********************************************************************* */ |
33 | 33 | ||
@@ -130,40 +130,40 @@ | |||
130 | /* System Manufacturing Register | 130 | /* System Manufacturing Register |
131 | * Register: SCD_SYSTEM_MANUF | 131 | * Register: SCD_SYSTEM_MANUF |
132 | */ | 132 | */ |
133 | 133 | ||
134 | /* Wafer ID: bits 31:0 */ | 134 | /* Wafer ID: bits 31:0 */ |
135 | #define S_SYS_WAFERID1_200 _SB_MAKE64(0) | 135 | #define S_SYS_WAFERID1_200 _SB_MAKE64(0) |
136 | #define M_SYS_WAFERID1_200 _SB_MAKEMASK(32,S_SYS_WAFERID1_200) | 136 | #define M_SYS_WAFERID1_200 _SB_MAKEMASK(32,S_SYS_WAFERID1_200) |
137 | #define V_SYS_WAFERID1_200(x) _SB_MAKEVALUE(x,S_SYS_WAFERID1_200) | 137 | #define V_SYS_WAFERID1_200(x) _SB_MAKEVALUE(x,S_SYS_WAFERID1_200) |
138 | #define G_SYS_WAFERID1_200(x) _SB_GETVALUE(x,S_SYS_WAFERID1_200,M_SYS_WAFERID1_200) | 138 | #define G_SYS_WAFERID1_200(x) _SB_GETVALUE(x,S_SYS_WAFERID1_200,M_SYS_WAFERID1_200) |
139 | 139 | ||
140 | #define S_SYS_BIN _SB_MAKE64(32) | 140 | #define S_SYS_BIN _SB_MAKE64(32) |
141 | #define M_SYS_BIN _SB_MAKEMASK(4,S_SYS_BIN) | 141 | #define M_SYS_BIN _SB_MAKEMASK(4,S_SYS_BIN) |
142 | #define V_SYS_BIN _SB_MAKEVALUE(x,S_SYS_BIN) | 142 | #define V_SYS_BIN _SB_MAKEVALUE(x,S_SYS_BIN) |
143 | #define G_SYS_BIN _SB_GETVALUE(x,S_SYS_BIN,M_SYS_BIN) | 143 | #define G_SYS_BIN _SB_GETVALUE(x,S_SYS_BIN,M_SYS_BIN) |
144 | 144 | ||
145 | /* Wafer ID: bits 39:36 */ | 145 | /* Wafer ID: bits 39:36 */ |
146 | #define S_SYS_WAFERID2_200 _SB_MAKE64(36) | 146 | #define S_SYS_WAFERID2_200 _SB_MAKE64(36) |
147 | #define M_SYS_WAFERID2_200 _SB_MAKEMASK(4,S_SYS_WAFERID2_200) | 147 | #define M_SYS_WAFERID2_200 _SB_MAKEMASK(4,S_SYS_WAFERID2_200) |
148 | #define V_SYS_WAFERID2_200(x) _SB_MAKEVALUE(x,S_SYS_WAFERID2_200) | 148 | #define V_SYS_WAFERID2_200(x) _SB_MAKEVALUE(x,S_SYS_WAFERID2_200) |
149 | #define G_SYS_WAFERID2_200(x) _SB_GETVALUE(x,S_SYS_WAFERID2_200,M_SYS_WAFERID2_200) | 149 | #define G_SYS_WAFERID2_200(x) _SB_GETVALUE(x,S_SYS_WAFERID2_200,M_SYS_WAFERID2_200) |
150 | 150 | ||
151 | /* Wafer ID: bits 39:0 */ | 151 | /* Wafer ID: bits 39:0 */ |
152 | #define S_SYS_WAFERID_300 _SB_MAKE64(0) | 152 | #define S_SYS_WAFERID_300 _SB_MAKE64(0) |
153 | #define M_SYS_WAFERID_300 _SB_MAKEMASK(40,S_SYS_WAFERID_300) | 153 | #define M_SYS_WAFERID_300 _SB_MAKEMASK(40,S_SYS_WAFERID_300) |
154 | #define V_SYS_WAFERID_300(x) _SB_MAKEVALUE(x,S_SYS_WAFERID_300) | 154 | #define V_SYS_WAFERID_300(x) _SB_MAKEVALUE(x,S_SYS_WAFERID_300) |
155 | #define G_SYS_WAFERID_300(x) _SB_GETVALUE(x,S_SYS_WAFERID_300,M_SYS_WAFERID_300) | 155 | #define G_SYS_WAFERID_300(x) _SB_GETVALUE(x,S_SYS_WAFERID_300,M_SYS_WAFERID_300) |
156 | 156 | ||
157 | #define S_SYS_XPOS _SB_MAKE64(40) | 157 | #define S_SYS_XPOS _SB_MAKE64(40) |
158 | #define M_SYS_XPOS _SB_MAKEMASK(6,S_SYS_XPOS) | 158 | #define M_SYS_XPOS _SB_MAKEMASK(6,S_SYS_XPOS) |
159 | #define V_SYS_XPOS(x) _SB_MAKEVALUE(x,S_SYS_XPOS) | 159 | #define V_SYS_XPOS(x) _SB_MAKEVALUE(x,S_SYS_XPOS) |
160 | #define G_SYS_XPOS(x) _SB_GETVALUE(x,S_SYS_XPOS,M_SYS_XPOS) | 160 | #define G_SYS_XPOS(x) _SB_GETVALUE(x,S_SYS_XPOS,M_SYS_XPOS) |
161 | 161 | ||
162 | #define S_SYS_YPOS _SB_MAKE64(46) | 162 | #define S_SYS_YPOS _SB_MAKE64(46) |
163 | #define M_SYS_YPOS _SB_MAKEMASK(6,S_SYS_YPOS) | 163 | #define M_SYS_YPOS _SB_MAKEMASK(6,S_SYS_YPOS) |
164 | #define V_SYS_YPOS(x) _SB_MAKEVALUE(x,S_SYS_YPOS) | 164 | #define V_SYS_YPOS(x) _SB_MAKEVALUE(x,S_SYS_YPOS) |
165 | #define G_SYS_YPOS(x) _SB_GETVALUE(x,S_SYS_YPOS,M_SYS_YPOS) | 165 | #define G_SYS_YPOS(x) _SB_GETVALUE(x,S_SYS_YPOS,M_SYS_YPOS) |
166 | 166 | ||
167 | /* | 167 | /* |
168 | * System Config Register (Table 4-2) | 168 | * System Config Register (Table 4-2) |
169 | * Register: SCD_SYSTEM_CFG | 169 | * Register: SCD_SYSTEM_CFG |
diff --git a/include/asm-mips/sibyte/sb1250_smbus.h b/include/asm-mips/sibyte/sb1250_smbus.h index 287cbfe9efa2..335c53e92936 100644 --- a/include/asm-mips/sibyte/sb1250_smbus.h +++ b/include/asm-mips/sibyte/sb1250_smbus.h | |||
@@ -1,23 +1,23 @@ | |||
1 | /* ********************************************************************* | 1 | /* ********************************************************************* |
2 | * SB1250 Board Support Package | 2 | * SB1250 Board Support Package |
3 | * | 3 | * |
4 | * SMBUS Constants File: sb1250_smbus.h | 4 | * SMBUS Constants File: sb1250_smbus.h |
5 | * | 5 | * |
6 | * This module contains constants and macros useful for | 6 | * This module contains constants and macros useful for |
7 | * manipulating the SB1250's SMbus devices. | 7 | * manipulating the SB1250's SMbus devices. |
8 | * | 8 | * |
9 | * SB1250 specification level: 01/02/2002 | 9 | * SB1250 specification level: 01/02/2002 |
10 | * | 10 | * |
11 | * Author: Mitch Lichtenberg | 11 | * Author: Mitch Lichtenberg |
12 | * | 12 | * |
13 | ********************************************************************* | 13 | ********************************************************************* |
14 | * | 14 | * |
15 | * Copyright 2000,2001,2002,2003 | 15 | * Copyright 2000,2001,2002,2003 |
16 | * Broadcom Corporation. All rights reserved. | 16 | * Broadcom Corporation. All rights reserved. |
17 | * | 17 | * |
18 | * This program is free software; you can redistribute it and/or | 18 | * This program is free software; you can redistribute it and/or |
19 | * modify it under the terms of the GNU General Public License as | 19 | * modify it under the terms of the GNU General Public License as |
20 | * published by the Free Software Foundation; either version 2 of | 20 | * published by the Free Software Foundation; either version 2 of |
21 | * the License, or (at your option) any later version. | 21 | * the License, or (at your option) any later version. |
22 | * | 22 | * |
23 | * This program is distributed in the hope that it will be useful, | 23 | * This program is distributed in the hope that it will be useful, |
@@ -27,7 +27,7 @@ | |||
27 | * | 27 | * |
28 | * You should have received a copy of the GNU General Public License | 28 | * You should have received a copy of the GNU General Public License |
29 | * along with this program; if not, write to the Free Software | 29 | * along with this program; if not, write to the Free Software |
30 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, | 30 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, |
31 | * MA 02111-1307 USA | 31 | * MA 02111-1307 USA |
32 | ********************************************************************* */ | 32 | ********************************************************************* */ |
33 | 33 | ||
diff --git a/include/asm-mips/sibyte/sb1250_syncser.h b/include/asm-mips/sibyte/sb1250_syncser.h index 8d5e8edd3c4b..fa2760d38b8b 100644 --- a/include/asm-mips/sibyte/sb1250_syncser.h +++ b/include/asm-mips/sibyte/sb1250_syncser.h | |||
@@ -7,17 +7,17 @@ | |||
7 | * manipulating the SB1250's Synchronous Serial | 7 | * manipulating the SB1250's Synchronous Serial |
8 | * | 8 | * |
9 | * SB1250 specification level: User's manual 1/02/02 | 9 | * SB1250 specification level: User's manual 1/02/02 |
10 | * | 10 | * |
11 | * Author: Mitch Lichtenberg | 11 | * Author: Mitch Lichtenberg |
12 | * | 12 | * |
13 | ********************************************************************* | 13 | ********************************************************************* |
14 | * | 14 | * |
15 | * Copyright 2000,2001,2002,2003 | 15 | * Copyright 2000,2001,2002,2003 |
16 | * Broadcom Corporation. All rights reserved. | 16 | * Broadcom Corporation. All rights reserved. |
17 | * | 17 | * |
18 | * This program is free software; you can redistribute it and/or | 18 | * This program is free software; you can redistribute it and/or |
19 | * modify it under the terms of the GNU General Public License as | 19 | * modify it under the terms of the GNU General Public License as |
20 | * published by the Free Software Foundation; either version 2 of | 20 | * published by the Free Software Foundation; either version 2 of |
21 | * the License, or (at your option) any later version. | 21 | * the License, or (at your option) any later version. |
22 | * | 22 | * |
23 | * This program is distributed in the hope that it will be useful, | 23 | * This program is distributed in the hope that it will be useful, |
@@ -27,7 +27,7 @@ | |||
27 | * | 27 | * |
28 | * You should have received a copy of the GNU General Public License | 28 | * You should have received a copy of the GNU General Public License |
29 | * along with this program; if not, write to the Free Software | 29 | * along with this program; if not, write to the Free Software |
30 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, | 30 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, |
31 | * MA 02111-1307 USA | 31 | * MA 02111-1307 USA |
32 | ********************************************************************* */ | 32 | ********************************************************************* */ |
33 | 33 | ||
diff --git a/include/asm-mips/sibyte/sb1250_uart.h b/include/asm-mips/sibyte/sb1250_uart.h index 7655d6945cca..923ea4f44e0f 100644 --- a/include/asm-mips/sibyte/sb1250_uart.h +++ b/include/asm-mips/sibyte/sb1250_uart.h | |||
@@ -1,23 +1,23 @@ | |||
1 | /* ********************************************************************* | 1 | /* ********************************************************************* |
2 | * SB1250 Board Support Package | 2 | * SB1250 Board Support Package |
3 | * | 3 | * |
4 | * UART Constants File: sb1250_uart.h | 4 | * UART Constants File: sb1250_uart.h |
5 | * | 5 | * |
6 | * This module contains constants and macros useful for | 6 | * This module contains constants and macros useful for |
7 | * manipulating the SB1250's UARTs | 7 | * manipulating the SB1250's UARTs |
8 | * | 8 | * |
9 | * SB1250 specification level: User's manual 1/02/02 | 9 | * SB1250 specification level: User's manual 1/02/02 |
10 | * | 10 | * |
11 | * Author: Mitch Lichtenberg | 11 | * Author: Mitch Lichtenberg |
12 | * | 12 | * |
13 | ********************************************************************* | 13 | ********************************************************************* |
14 | * | 14 | * |
15 | * Copyright 2000,2001,2002,2003 | 15 | * Copyright 2000,2001,2002,2003 |
16 | * Broadcom Corporation. All rights reserved. | 16 | * Broadcom Corporation. All rights reserved. |
17 | * | 17 | * |
18 | * This program is free software; you can redistribute it and/or | 18 | * This program is free software; you can redistribute it and/or |
19 | * modify it under the terms of the GNU General Public License as | 19 | * modify it under the terms of the GNU General Public License as |
20 | * published by the Free Software Foundation; either version 2 of | 20 | * published by the Free Software Foundation; either version 2 of |
21 | * the License, or (at your option) any later version. | 21 | * the License, or (at your option) any later version. |
22 | * | 22 | * |
23 | * This program is distributed in the hope that it will be useful, | 23 | * This program is distributed in the hope that it will be useful, |
@@ -27,7 +27,7 @@ | |||
27 | * | 27 | * |
28 | * You should have received a copy of the GNU General Public License | 28 | * You should have received a copy of the GNU General Public License |
29 | * along with this program; if not, write to the Free Software | 29 | * along with this program; if not, write to the Free Software |
30 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, | 30 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, |
31 | * MA 02111-1307 USA | 31 | * MA 02111-1307 USA |
32 | ********************************************************************* */ | 32 | ********************************************************************* */ |
33 | 33 | ||
@@ -37,7 +37,7 @@ | |||
37 | 37 | ||
38 | #include "sb1250_defs.h" | 38 | #include "sb1250_defs.h" |
39 | 39 | ||
40 | /* ********************************************************************** | 40 | /* ********************************************************************** |
41 | * DUART Registers | 41 | * DUART Registers |
42 | ********************************************************************** */ | 42 | ********************************************************************** */ |
43 | 43 | ||
@@ -145,7 +145,7 @@ | |||
145 | #define V_DUART_MISC_CMD_START_BREAK V_DUART_MISC_CMD(K_DUART_MISC_CMD_START_BREAK) | 145 | #define V_DUART_MISC_CMD_START_BREAK V_DUART_MISC_CMD(K_DUART_MISC_CMD_START_BREAK) |
146 | #define V_DUART_MISC_CMD_STOP_BREAK V_DUART_MISC_CMD(K_DUART_MISC_CMD_STOP_BREAK) | 146 | #define V_DUART_MISC_CMD_STOP_BREAK V_DUART_MISC_CMD(K_DUART_MISC_CMD_STOP_BREAK) |
147 | 147 | ||
148 | #define M_DUART_CMD_RESERVED _SB_MAKEMASK1(7) | 148 | #define M_DUART_CMD_RESERVED _SB_MAKEMASK1(7) |
149 | 149 | ||
150 | /* | 150 | /* |
151 | * DUART Status Register (Table 10-6) | 151 | * DUART Status Register (Table 10-6) |
@@ -165,7 +165,7 @@ | |||
165 | 165 | ||
166 | /* | 166 | /* |
167 | * DUART Baud Rate Register (Table 10-7) | 167 | * DUART Baud Rate Register (Table 10-7) |
168 | * Register: DUART_CLK_SEL_A | 168 | * Register: DUART_CLK_SEL_A |
169 | * Register: DUART_CLK_SEL_B | 169 | * Register: DUART_CLK_SEL_B |
170 | */ | 170 | */ |
171 | 171 | ||
@@ -332,7 +332,7 @@ | |||
332 | (chan == 0 ? M_DUART_OUT_PIN_CLR0 : M_DUART_OUT_PIN_CLR1) | 332 | (chan == 0 ? M_DUART_OUT_PIN_CLR0 : M_DUART_OUT_PIN_CLR1) |
333 | 333 | ||
334 | #if SIBYTE_HDR_FEATURE(1250, PASS2) || SIBYTE_HDR_FEATURE(112x, PASS1) | 334 | #if SIBYTE_HDR_FEATURE(1250, PASS2) || SIBYTE_HDR_FEATURE(112x, PASS1) |
335 | /* | 335 | /* |
336 | * Full Interrupt Control Register | 336 | * Full Interrupt Control Register |
337 | */ | 337 | */ |
338 | 338 | ||
diff --git a/include/asm-mips/sigcontext.h b/include/asm-mips/sigcontext.h index 18939e84b6f2..f7fbebaa0744 100644 --- a/include/asm-mips/sigcontext.h +++ b/include/asm-mips/sigcontext.h | |||
@@ -10,7 +10,7 @@ | |||
10 | #define _ASM_SIGCONTEXT_H | 10 | #define _ASM_SIGCONTEXT_H |
11 | 11 | ||
12 | #include <asm/sgidefs.h> | 12 | #include <asm/sgidefs.h> |
13 | 13 | ||
14 | #if _MIPS_SIM == _MIPS_SIM_ABI32 | 14 | #if _MIPS_SIM == _MIPS_SIM_ABI32 |
15 | 15 | ||
16 | /* | 16 | /* |
@@ -38,7 +38,7 @@ struct sigcontext { | |||
38 | }; | 38 | }; |
39 | 39 | ||
40 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ | 40 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ |
41 | 41 | ||
42 | #if _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32 | 42 | #if _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32 |
43 | 43 | ||
44 | /* | 44 | /* |
diff --git a/include/asm-mips/socket.h b/include/asm-mips/socket.h index d478a86294ee..753b6620e6fa 100644 --- a/include/asm-mips/socket.h +++ b/include/asm-mips/socket.h | |||
@@ -82,7 +82,7 @@ To add: #define SO_REUSEPORT 0x0200 /* Allow local address and port reuse. */ | |||
82 | * @SOCK_STREAM - stream (connection) socket | 82 | * @SOCK_STREAM - stream (connection) socket |
83 | * @SOCK_RAW - raw socket | 83 | * @SOCK_RAW - raw socket |
84 | * @SOCK_RDM - reliably-delivered message | 84 | * @SOCK_RDM - reliably-delivered message |
85 | * @SOCK_SEQPACKET - sequential packet socket | 85 | * @SOCK_SEQPACKET - sequential packet socket |
86 | * @SOCK_PACKET - linux specific way of getting packets at the dev level. | 86 | * @SOCK_PACKET - linux specific way of getting packets at the dev level. |
87 | * For writing rarp and other similar things on the user level. | 87 | * For writing rarp and other similar things on the user level. |
88 | */ | 88 | */ |
diff --git a/include/asm-mips/statfs.h b/include/asm-mips/statfs.h index 5076fec65780..c3ddf973c1c0 100644 --- a/include/asm-mips/statfs.h +++ b/include/asm-mips/statfs.h | |||
@@ -57,7 +57,7 @@ struct statfs64 { | |||
57 | }; | 57 | }; |
58 | 58 | ||
59 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ | 59 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ |
60 | 60 | ||
61 | #if _MIPS_SIM == _MIPS_SIM_ABI64 | 61 | #if _MIPS_SIM == _MIPS_SIM_ABI64 |
62 | 62 | ||
63 | struct statfs64 { /* Same as struct statfs */ | 63 | struct statfs64 { /* Same as struct statfs */ |
diff --git a/include/asm-mips/titan_dep.h b/include/asm-mips/titan_dep.h index fd9599e40a0a..fee1908c65d2 100644 --- a/include/asm-mips/titan_dep.h +++ b/include/asm-mips/titan_dep.h | |||
@@ -228,4 +228,4 @@ extern unsigned long ocd_base; | |||
228 | #define RM9K_READ_8(ofs, val) *(val) = *(volatile u8 *)(RM9000x2_BASE_ADDR+ofs) | 228 | #define RM9K_READ_8(ofs, val) *(val) = *(volatile u8 *)(RM9000x2_BASE_ADDR+ofs) |
229 | #define RM9K_READ_16(ofs, val) *(val) = *(volatile u16 *)(RM9000x2_BASE_ADDR+ofs) | 229 | #define RM9K_READ_16(ofs, val) *(val) = *(volatile u16 *)(RM9000x2_BASE_ADDR+ofs) |
230 | 230 | ||
231 | #endif | 231 | #endif |
diff --git a/include/asm-mips/tx4927/tx4927.h b/include/asm-mips/tx4927/tx4927.h index 5d939db6e220..3bb7f0087d68 100644 --- a/include/asm-mips/tx4927/tx4927.h +++ b/include/asm-mips/tx4927/tx4927.h | |||
@@ -45,14 +45,14 @@ | |||
45 | 45 | ||
46 | 46 | ||
47 | /* TX4927 SDRAM controller (64-bit registers) */ | 47 | /* TX4927 SDRAM controller (64-bit registers) */ |
48 | #define TX4927_SDRAMC_BASE 0x8000 | 48 | #define TX4927_SDRAMC_BASE 0x8000 |
49 | #define TX4927_SDRAMC_SDCCR0 0x8000 | 49 | #define TX4927_SDRAMC_SDCCR0 0x8000 |
50 | #define TX4927_SDRAMC_SDCCR1 0x8008 | 50 | #define TX4927_SDRAMC_SDCCR1 0x8008 |
51 | #define TX4927_SDRAMC_SDCCR2 0x8010 | 51 | #define TX4927_SDRAMC_SDCCR2 0x8010 |
52 | #define TX4927_SDRAMC_SDCCR3 0x8018 | 52 | #define TX4927_SDRAMC_SDCCR3 0x8018 |
53 | #define TX4927_SDRAMC_SDCTR 0x8040 | 53 | #define TX4927_SDRAMC_SDCTR 0x8040 |
54 | #define TX4927_SDRAMC_SDCMD 0x8058 | 54 | #define TX4927_SDRAMC_SDCMD 0x8058 |
55 | #define TX4927_SDRAMC_LIMIT 0x8fff | 55 | #define TX4927_SDRAMC_LIMIT 0x8fff |
56 | 56 | ||
57 | 57 | ||
58 | /* TX4927 external bus controller (64-bit registers) */ | 58 | /* TX4927 external bus controller (64-bit registers) */ |
@@ -289,8 +289,8 @@ | |||
289 | 289 | ||
290 | 290 | ||
291 | /* TX4927 serial port 0 (32-bit registers) */ | 291 | /* TX4927 serial port 0 (32-bit registers) */ |
292 | #define TX4927_SIO0_BASE 0xf300 | 292 | #define TX4927_SIO0_BASE 0xf300 |
293 | #define TX4927_SIO0_SILCR0 0xf300 | 293 | #define TX4927_SIO0_SILCR0 0xf300 |
294 | #define TX4927_SIO0_SILCR0_RESERVED_16_31 BM_16_31 | 294 | #define TX4927_SIO0_SILCR0_RESERVED_16_31 BM_16_31 |
295 | #define TX4927_SIO0_SILCR0_RWUB BM_15_15 | 295 | #define TX4927_SIO0_SILCR0_RWUB BM_15_15 |
296 | #define TX4927_SIO0_SILCR0_TWUB BM_14_14 | 296 | #define TX4927_SIO0_SILCR0_TWUB BM_14_14 |
@@ -309,7 +309,7 @@ | |||
309 | #define TX4927_SIO0_SILCR0_UMODE_DATA_7_BIT (~BM_00_01) | 309 | #define TX4927_SIO0_SILCR0_UMODE_DATA_7_BIT (~BM_00_01) |
310 | #define TX4927_SIO0_SILCR0_UMODE_DATA_8_BIT_MC BM_01_01 | 310 | #define TX4927_SIO0_SILCR0_UMODE_DATA_8_BIT_MC BM_01_01 |
311 | #define TX4927_SIO0_SILCR0_UMODE_DATA_7_BIT_MC BM_00_01 | 311 | #define TX4927_SIO0_SILCR0_UMODE_DATA_7_BIT_MC BM_00_01 |
312 | #define TX4927_SIO0_SIDICR0 0xf304 | 312 | #define TX4927_SIO0_SIDICR0 0xf304 |
313 | #define TX4927_SIO0_SIDICR0_RESERVED_16_31 BM_16_31 | 313 | #define TX4927_SIO0_SIDICR0_RESERVED_16_31 BM_16_31 |
314 | #define TX4927_SIO0_SIDICR0_TDE BM_15_15 | 314 | #define TX4927_SIO0_SIDICR0_TDE BM_15_15 |
315 | #define TX4927_SIO0_SIDICR0_RDE BM_14_14 | 315 | #define TX4927_SIO0_SIDICR0_RDE BM_14_14 |
@@ -330,7 +330,7 @@ | |||
330 | #define TX4927_SIO0_SIDICR0_STIE_TRDY BM_02_02 | 330 | #define TX4927_SIO0_SIDICR0_STIE_TRDY BM_02_02 |
331 | #define TX4927_SIO0_SIDICR0_STIE_TXALS BM_01_01 | 331 | #define TX4927_SIO0_SIDICR0_STIE_TXALS BM_01_01 |
332 | #define TX4927_SIO0_SIDICR0_STIE_UBRKD BM_00_00 | 332 | #define TX4927_SIO0_SIDICR0_STIE_UBRKD BM_00_00 |
333 | #define TX4927_SIO0_SIDISR0 0xf308 | 333 | #define TX4927_SIO0_SIDISR0 0xf308 |
334 | #define TX4927_SIO0_SIDISR0_RESERVED_16_31 BM_16_31 | 334 | #define TX4927_SIO0_SIDISR0_RESERVED_16_31 BM_16_31 |
335 | #define TX4927_SIO0_SIDISR0_UBRK BM_15_15 | 335 | #define TX4927_SIO0_SIDISR0_UBRK BM_15_15 |
336 | #define TX4927_SIO0_SIDISR0_UVALID BM_14_14 | 336 | #define TX4927_SIO0_SIDISR0_UVALID BM_14_14 |
@@ -344,7 +344,7 @@ | |||
344 | #define TX4927_SIO0_SIDISR0_STIS BM_06_06 | 344 | #define TX4927_SIO0_SIDISR0_STIS BM_06_06 |
345 | #define TX4927_SIO0_SIDISR0_RESERVED_05_05 BM_05_05 | 345 | #define TX4927_SIO0_SIDISR0_RESERVED_05_05 BM_05_05 |
346 | #define TX4927_SIO0_SIDISR0_RFDN BM_00_04 | 346 | #define TX4927_SIO0_SIDISR0_RFDN BM_00_04 |
347 | #define TX4927_SIO0_SISCISR0 0xf30c | 347 | #define TX4927_SIO0_SISCISR0 0xf30c |
348 | #define TX4927_SIO0_SISCISR0_RESERVED_06_31 BM_06_31 | 348 | #define TX4927_SIO0_SISCISR0_RESERVED_06_31 BM_06_31 |
349 | #define TX4927_SIO0_SISCISR0_OERS BM_05_05 | 349 | #define TX4927_SIO0_SISCISR0_OERS BM_05_05 |
350 | #define TX4927_SIO0_SISCISR0_CTSS BM_04_04 | 350 | #define TX4927_SIO0_SISCISR0_CTSS BM_04_04 |
@@ -352,7 +352,7 @@ | |||
352 | #define TX4927_SIO0_SISCISR0_TRDY BM_02_02 | 352 | #define TX4927_SIO0_SISCISR0_TRDY BM_02_02 |
353 | #define TX4927_SIO0_SISCISR0_TXALS BM_01_01 | 353 | #define TX4927_SIO0_SISCISR0_TXALS BM_01_01 |
354 | #define TX4927_SIO0_SISCISR0_UBRKD BM_00_00 | 354 | #define TX4927_SIO0_SISCISR0_UBRKD BM_00_00 |
355 | #define TX4927_SIO0_SIFCR0 0xf310 | 355 | #define TX4927_SIO0_SIFCR0 0xf310 |
356 | #define TX4927_SIO0_SIFCR0_RESERVED_16_31 BM_16_31 | 356 | #define TX4927_SIO0_SIFCR0_RESERVED_16_31 BM_16_31 |
357 | #define TX4927_SIO0_SIFCR0_SWRST BM_16_31 | 357 | #define TX4927_SIO0_SIFCR0_SWRST BM_16_31 |
358 | #define TX4927_SIO0_SIFCR0_RESERVED_09_14 BM_09_14 | 358 | #define TX4927_SIO0_SIFCR0_RESERVED_09_14 BM_09_14 |
@@ -370,7 +370,7 @@ | |||
370 | #define TX4927_SIO0_SIFCR0_TFRST BM_02_02 | 370 | #define TX4927_SIO0_SIFCR0_TFRST BM_02_02 |
371 | #define TX4927_SIO0_SIFCR0_RFRST BM_01_01 | 371 | #define TX4927_SIO0_SIFCR0_RFRST BM_01_01 |
372 | #define TX4927_SIO0_SIFCR0_FRSTE BM_00_00 | 372 | #define TX4927_SIO0_SIFCR0_FRSTE BM_00_00 |
373 | #define TX4927_SIO0_SIFLCR0 0xf314 | 373 | #define TX4927_SIO0_SIFLCR0 0xf314 |
374 | #define TX4927_SIO0_SIFLCR0_RESERVED_13_31 BM_13_31 | 374 | #define TX4927_SIO0_SIFLCR0_RESERVED_13_31 BM_13_31 |
375 | #define TX4927_SIO0_SIFLCR0_RCS BM_12_12 | 375 | #define TX4927_SIO0_SIFLCR0_RCS BM_12_12 |
376 | #define TX4927_SIO0_SIFLCR0_TES BM_11_11 | 376 | #define TX4927_SIO0_SIFLCR0_TES BM_11_11 |
@@ -381,7 +381,7 @@ | |||
381 | #define TX4927_SIO0_SIFLCR0_RESERVED_05_06 BM_05_06 | 381 | #define TX4927_SIO0_SIFLCR0_RESERVED_05_06 BM_05_06 |
382 | #define TX4927_SIO0_SIFLCR0_RTSTL BM_01_04 | 382 | #define TX4927_SIO0_SIFLCR0_RTSTL BM_01_04 |
383 | #define TX4927_SIO0_SIFLCR0_TBRK BM_00_00 | 383 | #define TX4927_SIO0_SIFLCR0_TBRK BM_00_00 |
384 | #define TX4927_SIO0_SIBGR0 0xf318 | 384 | #define TX4927_SIO0_SIBGR0 0xf318 |
385 | #define TX4927_SIO0_SIBGR0_RESERVED_10_31 BM_10_31 | 385 | #define TX4927_SIO0_SIBGR0_RESERVED_10_31 BM_10_31 |
386 | #define TX4927_SIO0_SIBGR0_BCLK BM_08_09 | 386 | #define TX4927_SIO0_SIBGR0_BCLK BM_08_09 |
387 | #define TX4927_SIO0_SIBGR0_BCLK_T0 (~BM_08_09) | 387 | #define TX4927_SIO0_SIBGR0_BCLK_T0 (~BM_08_09) |
@@ -389,28 +389,28 @@ | |||
389 | #define TX4927_SIO0_SIBGR0_BCLK_T4 BM_09_09 | 389 | #define TX4927_SIO0_SIBGR0_BCLK_T4 BM_09_09 |
390 | #define TX4927_SIO0_SIBGR0_BCLK_T6 BM_08_09 | 390 | #define TX4927_SIO0_SIBGR0_BCLK_T6 BM_08_09 |
391 | #define TX4927_SIO0_SIBGR0_BRD BM_00_07 | 391 | #define TX4927_SIO0_SIBGR0_BRD BM_00_07 |
392 | #define TX4927_SIO0_SITFIF00 0xf31c | 392 | #define TX4927_SIO0_SITFIF00 0xf31c |
393 | #define TX4927_SIO0_SITFIF00_RESERVED_08_31 BM_08_31 | 393 | #define TX4927_SIO0_SITFIF00_RESERVED_08_31 BM_08_31 |
394 | #define TX4927_SIO0_SITFIF00_TXD BM_00_07 | 394 | #define TX4927_SIO0_SITFIF00_TXD BM_00_07 |
395 | #define TX4927_SIO0_SIRFIFO0 0xf320 | 395 | #define TX4927_SIO0_SIRFIFO0 0xf320 |
396 | #define TX4927_SIO0_SIRFIFO0_RESERVED_08_31 BM_08_31 | 396 | #define TX4927_SIO0_SIRFIFO0_RESERVED_08_31 BM_08_31 |
397 | #define TX4927_SIO0_SIRFIFO0_RXD BM_00_07 | 397 | #define TX4927_SIO0_SIRFIFO0_RXD BM_00_07 |
398 | #define TX4927_SIO0_SIRFIFO0 0xf320 | 398 | #define TX4927_SIO0_SIRFIFO0 0xf320 |
399 | #define TX4927_SIO0_LIMIT 0xf3ff | 399 | #define TX4927_SIO0_LIMIT 0xf3ff |
400 | 400 | ||
401 | 401 | ||
402 | /* TX4927 serial port 1 (32-bit registers) */ | 402 | /* TX4927 serial port 1 (32-bit registers) */ |
403 | #define TX4927_SIO1_BASE 0xf400 | 403 | #define TX4927_SIO1_BASE 0xf400 |
404 | #define TX4927_SIO1_SILCR1 0xf400 | 404 | #define TX4927_SIO1_SILCR1 0xf400 |
405 | #define TX4927_SIO1_SIDICR1 0xf404 | 405 | #define TX4927_SIO1_SIDICR1 0xf404 |
406 | #define TX4927_SIO1_SIDISR1 0xf408 | 406 | #define TX4927_SIO1_SIDISR1 0xf408 |
407 | #define TX4927_SIO1_SISCISR1 0xf40c | 407 | #define TX4927_SIO1_SISCISR1 0xf40c |
408 | #define TX4927_SIO1_SIFCR1 0xf410 | 408 | #define TX4927_SIO1_SIFCR1 0xf410 |
409 | #define TX4927_SIO1_SIFLCR1 0xf414 | 409 | #define TX4927_SIO1_SIFLCR1 0xf414 |
410 | #define TX4927_SIO1_SIBGR1 0xf418 | 410 | #define TX4927_SIO1_SIBGR1 0xf418 |
411 | #define TX4927_SIO1_SITFIF01 0xf41c | 411 | #define TX4927_SIO1_SITFIF01 0xf41c |
412 | #define TX4927_SIO1_SIRFIFO1 0xf420 | 412 | #define TX4927_SIO1_SIRFIFO1 0xf420 |
413 | #define TX4927_SIO1_LIMIT 0xf4ff | 413 | #define TX4927_SIO1_LIMIT 0xf4ff |
414 | 414 | ||
415 | 415 | ||
416 | /* TX4927 parallel port (32-bit registers) */ | 416 | /* TX4927 parallel port (32-bit registers) */ |
diff --git a/include/asm-mips/tx4927/tx4927_pci.h b/include/asm-mips/tx4927/tx4927_pci.h index 170433492246..165f6b8b217f 100644 --- a/include/asm-mips/tx4927/tx4927_pci.h +++ b/include/asm-mips/tx4927/tx4927_pci.h | |||
@@ -5,8 +5,8 @@ | |||
5 | * | 5 | * |
6 | * Copyright (C) 2000-2001 Toshiba Corporation | 6 | * Copyright (C) 2000-2001 Toshiba Corporation |
7 | */ | 7 | */ |
8 | #ifndef __ASM_TX4927_TX4927_PCI_H | 8 | #ifndef __ASM_TX4927_TX4927_PCI_H |
9 | #define __ASM_TX4927_TX4927_PCI_H | 9 | #define __ASM_TX4927_TX4927_PCI_H |
10 | 10 | ||
11 | #define TX4927_CCFG_TOE 0x00004000 | 11 | #define TX4927_CCFG_TOE 0x00004000 |
12 | 12 | ||
diff --git a/include/asm-mips/vr41xx/vrc4173.h b/include/asm-mips/vr41xx/vrc4173.h index 58e193c51b45..bb7a85c186e4 100644 --- a/include/asm-mips/vr41xx/vrc4173.h +++ b/include/asm-mips/vr41xx/vrc4173.h | |||
@@ -21,8 +21,8 @@ | |||
21 | * along with this program; if not, write to the Free Software | 21 | * along with this program; if not, write to the Free Software |
22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 22 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
23 | */ | 23 | */ |
24 | #ifndef __NEC_VRC4173_H | 24 | #ifndef __NEC_VRC4173_H |
25 | #define __NEC_VRC4173_H | 25 | #define __NEC_VRC4173_H |
26 | 26 | ||
27 | #include <linux/config.h> | 27 | #include <linux/config.h> |
28 | #include <asm/io.h> | 28 | #include <asm/io.h> |
diff --git a/include/asm-mips/war.h b/include/asm-mips/war.h index c4a704121343..04ee53b34c2e 100644 --- a/include/asm-mips/war.h +++ b/include/asm-mips/war.h | |||
@@ -113,7 +113,7 @@ | |||
113 | */ | 113 | */ |
114 | #define BCM1250_M3_WAR 1 | 114 | #define BCM1250_M3_WAR 1 |
115 | 115 | ||
116 | /* | 116 | /* |
117 | * This is a DUART workaround related to glitches around register accesses | 117 | * This is a DUART workaround related to glitches around register accesses |
118 | */ | 118 | */ |
119 | #define SIBYTE_1956_WAR 1 | 119 | #define SIBYTE_1956_WAR 1 |
@@ -122,7 +122,7 @@ | |||
122 | 122 | ||
123 | /* | 123 | /* |
124 | * Fill buffers not flushed on CACHE instructions | 124 | * Fill buffers not flushed on CACHE instructions |
125 | * | 125 | * |
126 | * Hit_Invalidate_I cacheops invalidate an icache line but the refill | 126 | * Hit_Invalidate_I cacheops invalidate an icache line but the refill |
127 | * for that line can get stale data from the fill buffer instead of | 127 | * for that line can get stale data from the fill buffer instead of |
128 | * accessing memory if the previous icache miss was also to that line. | 128 | * accessing memory if the previous icache miss was also to that line. |
diff --git a/include/asm-mips/xxs1500.h b/include/asm-mips/xxs1500.h index 75c0ddfeca13..4d84a90b0f20 100644 --- a/include/asm-mips/xxs1500.h +++ b/include/asm-mips/xxs1500.h | |||
@@ -22,7 +22,7 @@ | |||
22 | * | 22 | * |
23 | * ######################################################################## | 23 | * ######################################################################## |
24 | * | 24 | * |
25 | * | 25 | * |
26 | */ | 26 | */ |
27 | #ifndef __ASM_XXS1500_H | 27 | #ifndef __ASM_XXS1500_H |
28 | #define __ASM_XXS1500_H | 28 | #define __ASM_XXS1500_H |