diff options
Diffstat (limited to 'arch/mips/au1000')
-rw-r--r-- | arch/mips/au1000/common/pci.c | 8 | ||||
-rw-r--r-- | arch/mips/au1000/common/setup.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/common/time.c | 14 | ||||
-rw-r--r-- | arch/mips/au1000/csb250/board_setup.c | 4 | ||||
-rw-r--r-- | arch/mips/au1000/csb250/init.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/db1x00/init.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/hydrogen3/init.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/pb1000/board_setup.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/xxs1500/board_setup.c | 6 | ||||
-rw-r--r-- | arch/mips/au1000/xxs1500/init.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/xxs1500/irqmap.c | 2 |
11 files changed, 23 insertions, 23 deletions
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 */ |