Merge git://git.infradead.org/battery-2.6

[pandora-kernel.git] / arch / mips / sni / pcit.c

diff --git a/arch/mips/sni/pcit.c b/arch/mips/sni/pcit.c
index 00d151f..416f397 100644 (file)
--- a/arch/mips/sni/pcit.c
+++ b/arch/mips/sni/pcit.c
@@ -13,7 +13,6 @@
 #include <linux/pci.h>
 #include <linux/serial_8250.h>
 
-#include <asm/mc146818-time.h>
 #include <asm/sni.h>
 #include <asm/time.h>
 #include <asm/irq_cpu.h>
@@ -58,6 +57,25 @@ static struct platform_device pcit_cplus_serial8250_device = {
        },
 };
 
+static struct resource pcit_cmos_rsrc[] = {
+        {
+                .start = 0x70,
+                .end   = 0x71,
+                .flags = IORESOURCE_IO
+        },
+        {
+                .start = 8,
+                .end   = 8,
+                .flags = IORESOURCE_IRQ
+        }
+};
+
+static struct platform_device pcit_cmos_device = {
+        .name           = "rtc_cmos",
+        .num_resources  = ARRAY_SIZE(pcit_cmos_rsrc),
+        .resource       = pcit_cmos_rsrc
+};
+
 static struct resource sni_io_resource = {
        .start  = 0x00000000UL,
        .end    = 0x03bfffffUL,
@@ -170,8 +188,8 @@ static void pcit_hwint1(void)
        irq = ffs((pending >> 16) & 0x7f);
 
        if (likely(irq > 0))
-               do_IRQ (irq + SNI_PCIT_INT_START - 1);
-       set_c0_status (IE_IRQ1);
+               do_IRQ(irq + SNI_PCIT_INT_START - 1);
+       set_c0_status(IE_IRQ1);
 }
 
 static void pcit_hwint0(void)
@@ -183,8 +201,8 @@ static void pcit_hwint0(void)
        irq = ffs((pending >> 16) & 0x3f);
 
        if (likely(irq > 0))
-               do_IRQ (irq + SNI_PCIT_INT_START - 1);
-       set_c0_status (IE_IRQ0);
+               do_IRQ(irq + SNI_PCIT_INT_START - 1);
+       set_c0_status(IE_IRQ0);
 }
 
 static void sni_pcit_hwint(void)
@@ -194,11 +212,11 @@ static void sni_pcit_hwint(void)
        if (pending & C_IRQ1)
                pcit_hwint1();
        else if (pending & C_IRQ2)
-               do_IRQ (MIPS_CPU_IRQ_BASE + 4);
+               do_IRQ(MIPS_CPU_IRQ_BASE + 4);
        else if (pending & C_IRQ3)
-               do_IRQ (MIPS_CPU_IRQ_BASE + 5);
+               do_IRQ(MIPS_CPU_IRQ_BASE + 5);
        else if (pending & C_IRQ5)
-               do_IRQ (MIPS_CPU_IRQ_BASE + 7);
+               do_IRQ(MIPS_CPU_IRQ_BASE + 7);
 }
 
 static void sni_pcit_hwint_cplus(void)
@@ -208,13 +226,13 @@ static void sni_pcit_hwint_cplus(void)
        if (pending & C_IRQ0)
                pcit_hwint0();
        else if (pending & C_IRQ1)
-               do_IRQ (MIPS_CPU_IRQ_BASE + 3);
+               do_IRQ(MIPS_CPU_IRQ_BASE + 3);
        else if (pending & C_IRQ2)
-               do_IRQ (MIPS_CPU_IRQ_BASE + 4);
+               do_IRQ(MIPS_CPU_IRQ_BASE + 4);
        else if (pending & C_IRQ3)
-               do_IRQ (MIPS_CPU_IRQ_BASE + 5);
+               do_IRQ(MIPS_CPU_IRQ_BASE + 5);
        else if (pending & C_IRQ5)
-               do_IRQ (MIPS_CPU_IRQ_BASE + 7);
+               do_IRQ(MIPS_CPU_IRQ_BASE + 7);
 }
 
 void __init sni_pcit_irq_init(void)
@@ -227,7 +245,7 @@ void __init sni_pcit_irq_init(void)
        *(volatile u32 *)SNI_PCIT_INT_REG = 0;
        sni_hwint = sni_pcit_hwint;
        change_c0_status(ST0_IM, IE_IRQ1);
-       setup_irq (SNI_PCIT_INT_START + 6, &sni_isa_irq);
+       setup_irq(SNI_PCIT_INT_START + 6, &sni_isa_irq);
 }
 
 void __init sni_pcit_cplus_irq_init(void)
@@ -240,14 +258,11 @@ void __init sni_pcit_cplus_irq_init(void)
        *(volatile u32 *)SNI_PCIT_INT_REG = 0x40000000;
        sni_hwint = sni_pcit_hwint_cplus;
        change_c0_status(ST0_IM, IE_IRQ0);
-       setup_irq (MIPS_CPU_IRQ_BASE + 3, &sni_isa_irq);
+       setup_irq(MIPS_CPU_IRQ_BASE + 3, &sni_isa_irq);
 }
 
-void sni_pcit_init(void)
+void __init sni_pcit_init(void)
 {
-       rtc_mips_get_time = mc146818_get_cmos_time;
-       rtc_mips_set_time = mc146818_set_rtc_mmss;
-       board_time_init = sni_cpu_time_init;
        ioport_resource.end = sni_io_resource.end;
 #ifdef CONFIG_PCI
        PCIBIOS_MIN_IO = 0x9000;
@@ -261,10 +276,12 @@ static int __init snirm_pcit_setup_devinit(void)
        switch (sni_brd_type) {
        case SNI_BRD_PCI_TOWER:
                platform_device_register(&pcit_serial8250_device);
+               platform_device_register(&pcit_cmos_device);
                break;
 
        case SNI_BRD_PCI_TOWER_CPLUS:
                platform_device_register(&pcit_cplus_serial8250_device);
+               platform_device_register(&pcit_cmos_device);
                break;
        }
        return 0;