diff options
author | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2007-06-20 17:36:47 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-07-10 12:33:03 -0400 |
commit | 06cf5583fd9ac782cf34996cdabb48afdf478e37 (patch) | |
tree | 45e27ae328e9e3f021a29cc8e8b95d3bef618255 /arch/mips/sni/pcimt.c | |
parent | 68bc00e31143ad8bfa435425e0a11e9b3998911d (diff) |
[MIPS] SNI RM updates
- use RTC_CLASS instead of GEN_RTC
- get rid of ds1216 in favour of a RTC_CLASS driver
- use correct console device for older RM400
- use physical addresses for 82596 device
- use 128 byte L1 cache line size (this is needed because most of the
SNI caches are using 128 L2 cache lines)
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/sni/pcimt.c')
-rw-r--r-- | arch/mips/sni/pcimt.c | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/arch/mips/sni/pcimt.c b/arch/mips/sni/pcimt.c index 97b234361b4d..44b1ae62aa4a 100644 --- a/arch/mips/sni/pcimt.c +++ b/arch/mips/sni/pcimt.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #include <linux/pci.h> | 14 | #include <linux/pci.h> |
15 | #include <linux/serial_8250.h> | 15 | #include <linux/serial_8250.h> |
16 | 16 | ||
17 | #include <asm/mc146818-time.h> | ||
18 | #include <asm/sni.h> | 17 | #include <asm/sni.h> |
19 | #include <asm/time.h> | 18 | #include <asm/time.h> |
20 | #include <asm/i8259.h> | 19 | #include <asm/i8259.h> |
@@ -90,6 +89,26 @@ static struct platform_device pcimt_serial8250_device = { | |||
90 | }, | 89 | }, |
91 | }; | 90 | }; |
92 | 91 | ||
92 | static struct resource pcimt_cmos_rsrc[] = { | ||
93 | { | ||
94 | .start = 0x70, | ||
95 | .end = 0x71, | ||
96 | .flags = IORESOURCE_IO | ||
97 | }, | ||
98 | { | ||
99 | .start = 8, | ||
100 | .end = 8, | ||
101 | .flags = IORESOURCE_IRQ | ||
102 | } | ||
103 | }; | ||
104 | |||
105 | static struct platform_device pcimt_cmos_device = { | ||
106 | .name = "rtc_cmos", | ||
107 | .num_resources = ARRAY_SIZE(pcimt_cmos_rsrc), | ||
108 | .resource = pcimt_cmos_rsrc | ||
109 | }; | ||
110 | |||
111 | |||
93 | static struct resource sni_io_resource = { | 112 | static struct resource sni_io_resource = { |
94 | .start = 0x00000000UL, | 113 | .start = 0x00000000UL, |
95 | .end = 0x03bfffffUL, | 114 | .end = 0x03bfffffUL, |
@@ -290,12 +309,10 @@ void __init sni_pcimt_irq_init(void) | |||
290 | change_c0_status(ST0_IM, IE_IRQ1|IE_IRQ3); | 309 | change_c0_status(ST0_IM, IE_IRQ1|IE_IRQ3); |
291 | } | 310 | } |
292 | 311 | ||
293 | void sni_pcimt_init(void) | 312 | void __init sni_pcimt_init(void) |
294 | { | 313 | { |
295 | sni_pcimt_detect(); | 314 | sni_pcimt_detect(); |
296 | sni_pcimt_sc_init(); | 315 | sni_pcimt_sc_init(); |
297 | rtc_mips_get_time = mc146818_get_cmos_time; | ||
298 | rtc_mips_set_time = mc146818_set_rtc_mmss; | ||
299 | board_time_init = sni_cpu_time_init; | 316 | board_time_init = sni_cpu_time_init; |
300 | ioport_resource.end = sni_io_resource.end; | 317 | ioport_resource.end = sni_io_resource.end; |
301 | #ifdef CONFIG_PCI | 318 | #ifdef CONFIG_PCI |
@@ -312,6 +329,7 @@ static int __init snirm_pcimt_setup_devinit(void) | |||
312 | case SNI_BRD_PCI_DESKTOP: | 329 | case SNI_BRD_PCI_DESKTOP: |
313 | case SNI_BRD_PCI_MTOWER_CPLUS: | 330 | case SNI_BRD_PCI_MTOWER_CPLUS: |
314 | platform_device_register(&pcimt_serial8250_device); | 331 | platform_device_register(&pcimt_serial8250_device); |
332 | platform_device_register(&pcimt_cmos_device); | ||
315 | break; | 333 | break; |
316 | } | 334 | } |
317 | 335 | ||