linux-mips
[Top] [All Lists]

[PATCH][2.6] Moved timer setup to common part for vr41xx

To: Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH][2.6] Moved timer setup to common part for vr41xx
From: Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
Date: Sun, 22 Feb 2004 00:31:12 +0900
Cc: yuasa@hh.iij4u.or.jp, linux-mips <linux-mips@linux-mips.org>
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
Hi Ralf,

I update a patch for timer of vr41xx.
This patch get together setup of dispersed timer to one place.

Please apply to v2.6.

Yoichi

diff -urN -X dontdiff linux-orig/arch/mips/vr41xx/casio-e55/setup.c 
linux/arch/mips/vr41xx/casio-e55/setup.c
--- linux-orig/arch/mips/vr41xx/casio-e55/setup.c       Sun Feb  1 21:41:34 2004
+++ linux/arch/mips/vr41xx/casio-e55/setup.c    Sat Feb 21 17:13:54 2004
@@ -24,7 +24,6 @@
 #include <linux/kdev_t.h>
 #include <linux/root_dev.h>
 
-#include <asm/time.h>
 #include <asm/vr41xx/e55.h>
 
 #ifdef CONFIG_BLK_DEV_INITRD
@@ -46,14 +45,13 @@
        initrd_end = (unsigned long)&__rd_end;
 #endif
 
-       board_time_init = vr41xx_time_init;
-       board_timer_setup = vr41xx_timer_setup;
-
        vr41xx_bcu_init();
 
        vr41xx_cmu_init();
 
        vr41xx_pmu_init();
+
+       vr41xx_rtc_init();
 
 #ifdef CONFIG_SERIAL_8250
        vr41xx_siu_init(SIU_RS232C, 0);
diff -urN -X dontdiff linux-orig/arch/mips/vr41xx/common/rtc.c 
linux/arch/mips/vr41xx/common/rtc.c
--- linux-orig/arch/mips/vr41xx/common/rtc.c    Tue Jan 13 08:21:05 2004
+++ linux/arch/mips/vr41xx/common/rtc.c Sat Feb 21 17:13:54 2004
@@ -259,7 +259,7 @@
        epoch_time = time;
 }
 
-void __init vr41xx_time_init(void)
+static void __init vr41xx_time_init(void)
 {
        switch (current_cpu_data.cputype) {
        case CPU_VR4111:
@@ -291,7 +291,7 @@
        rtc_set_time = vr41xx_set_time;
 }
 
-void __init vr41xx_timer_setup(struct irqaction *irq)
+static void __init vr41xx_timer_setup(struct irqaction *irq)
 {
        do_gettimeoffset = vr41xx_gettimeoffset;
 
@@ -308,4 +308,10 @@
        write_rtc2(ELAPSEDTIME_INT, RTCINTREG);
 
        setup_irq(ELAPSEDTIME_IRQ, irq);
+}
+
+void __init vr41xx_rtc_init(void)
+{
+       board_time_init = vr41xx_time_init;
+       board_timer_setup = vr41xx_timer_setup;
 }
diff -urN -X dontdiff linux-orig/arch/mips/vr41xx/ibm-workpad/setup.c 
linux/arch/mips/vr41xx/ibm-workpad/setup.c
--- linux-orig/arch/mips/vr41xx/ibm-workpad/setup.c     Sun Feb  1 21:41:34 2004
+++ linux/arch/mips/vr41xx/ibm-workpad/setup.c  Sat Feb 21 17:13:54 2004
@@ -24,7 +24,6 @@
 #include <linux/kdev_t.h>
 #include <linux/root_dev.h>
 
-#include <asm/time.h>
 #include <asm/vr41xx/workpad.h>
 
 #ifdef CONFIG_BLK_DEV_INITRD
@@ -46,14 +45,13 @@
        initrd_end = (unsigned long)&__rd_end;
 #endif
 
-       board_time_init = vr41xx_time_init;
-       board_timer_setup = vr41xx_timer_setup;
-
        vr41xx_bcu_init();
 
        vr41xx_cmu_init();
 
        vr41xx_pmu_init();
+
+       vr41xx_rtc_init();
 
 #ifdef CONFIG_SERIAL_8250
        vr41xx_siu_init(SIU_RS232C, 0);
diff -urN -X dontdiff linux-orig/arch/mips/vr41xx/nec-eagle/setup.c 
linux/arch/mips/vr41xx/nec-eagle/setup.c
--- linux-orig/arch/mips/vr41xx/nec-eagle/setup.c       Fri Feb 20 00:49:46 2004
+++ linux/arch/mips/vr41xx/nec-eagle/setup.c    Sat Feb 21 17:13:54 2004
@@ -18,7 +18,6 @@
 #include <linux/root_dev.h>
 
 #include <asm/pci_channel.h>
-#include <asm/time.h>
 #include <asm/vr41xx/eagle.h>
 
 #ifdef CONFIG_BLK_DEV_INITRD
@@ -93,9 +92,6 @@
        initrd_end = (unsigned long)&__rd_end;
 #endif
 
-       board_time_init = vr41xx_time_init;
-       board_timer_setup = vr41xx_timer_setup;
-
        board_irq_init = eagle_irq_init;
 
        vr41xx_bcu_init();
@@ -103,6 +99,8 @@
        vr41xx_cmu_init();
 
        vr41xx_pmu_init();
+
+       vr41xx_rtc_init();
 
 #ifdef CONFIG_SERIAL_8250
        vr41xx_dsiu_init();
diff -urN -X dontdiff linux-orig/arch/mips/vr41xx/tanbac-tb0226/setup.c 
linux/arch/mips/vr41xx/tanbac-tb0226/setup.c
--- linux-orig/arch/mips/vr41xx/tanbac-tb0226/setup.c   Sun Feb  1 21:41:34 2004
+++ linux/arch/mips/vr41xx/tanbac-tb0226/setup.c        Sat Feb 21 17:13:54 2004
@@ -22,7 +22,6 @@
 #include <linux/ioport.h>
 
 #include <asm/pci_channel.h>
-#include <asm/time.h>
 #include <asm/vr41xx/tb0226.h>
 
 #ifdef CONFIG_BLK_DEV_INITRD
@@ -92,14 +91,13 @@
        initrd_end = (unsigned long)&__rd_end;
 #endif
 
-       board_time_init = vr41xx_time_init;
-       board_timer_setup = vr41xx_timer_setup;
-
        vr41xx_bcu_init();
 
        vr41xx_cmu_init();
 
        vr41xx_pmu_init();
+
+       vr41xx_rtc_init();
 
        vr41xx_siu_init(SIU_RS232C, 0);
 
diff -urN -X dontdiff linux-orig/arch/mips/vr41xx/tanbac-tb0229/setup.c 
linux/arch/mips/vr41xx/tanbac-tb0229/setup.c
--- linux-orig/arch/mips/vr41xx/tanbac-tb0229/setup.c   Sun Feb  1 21:41:34 2004
+++ linux/arch/mips/vr41xx/tanbac-tb0229/setup.c        Sat Feb 21 17:13:54 2004
@@ -28,7 +28,6 @@
 
 #include <asm/pci_channel.h>
 #include <asm/reboot.h>
-#include <asm/time.h>
 #include <asm/vr41xx/tb0229.h>
 
 #ifdef CONFIG_BLK_DEV_INITRD
@@ -97,14 +96,13 @@
        initrd_end = (unsigned long)&__rd_end;
 #endif
 
-       board_time_init = vr41xx_time_init;
-       board_timer_setup = vr41xx_timer_setup;
-
        vr41xx_bcu_init();
 
        vr41xx_cmu_init();
 
        vr41xx_pmu_init();
+
+       vr41xx_rtc_init();
 
        vr41xx_siu_init(SIU_RS232C, 0);
        vr41xx_dsiu_init();
diff -urN -X dontdiff linux-orig/arch/mips/vr41xx/victor-mpc30x/setup.c 
linux/arch/mips/vr41xx/victor-mpc30x/setup.c
--- linux-orig/arch/mips/vr41xx/victor-mpc30x/setup.c   Sun Feb  1 21:41:34 2004
+++ linux/arch/mips/vr41xx/victor-mpc30x/setup.c        Sat Feb 21 17:13:54 2004
@@ -25,7 +25,6 @@
 #include <linux/root_dev.h>
 
 #include <asm/pci_channel.h>
-#include <asm/time.h>
 #include <asm/vr41xx/mpc30x.h>
 
 #ifdef CONFIG_BLK_DEV_INITRD
@@ -95,14 +94,13 @@
        initrd_end = (unsigned long)&__rd_end;
 #endif
 
-       board_time_init = vr41xx_time_init;
-       board_timer_setup = vr41xx_timer_setup;
-
        vr41xx_bcu_init();
 
        vr41xx_cmu_init();
 
        vr41xx_pmu_init();
+
+       vr41xx_rtc_init();
 
 #ifdef CONFIG_SERIAL_8250
        vr41xx_siu_init(SIU_RS232C, 0);
diff -urN -X dontdiff linux-orig/arch/mips/vr41xx/zao-capcella/setup.c 
linux/arch/mips/vr41xx/zao-capcella/setup.c
--- linux-orig/arch/mips/vr41xx/zao-capcella/setup.c    Sun Feb  1 21:41:34 2004
+++ linux/arch/mips/vr41xx/zao-capcella/setup.c Sat Feb 21 17:13:54 2004
@@ -25,7 +25,6 @@
 #include <linux/root_dev.h>
 
 #include <asm/pci_channel.h>
-#include <asm/time.h>
 #include <asm/vr41xx/capcella.h>
 
 #ifdef CONFIG_BLK_DEV_INITRD
@@ -95,14 +94,13 @@
        initrd_end = (unsigned long)&__rd_end;
 #endif
 
-       board_time_init = vr41xx_time_init;
-       board_timer_setup = vr41xx_timer_setup;
-
        vr41xx_bcu_init();
 
        vr41xx_cmu_init();
 
        vr41xx_pmu_init();
+
+       vr41xx_rtc_init();
 
 #ifdef CONFIG_SERIAL_8250
        vr41xx_siu_init(SIU_RS232C, 0);
diff -urN -X dontdiff linux-orig/include/asm-mips/vr41xx/vr41xx.h 
linux/include/asm-mips/vr41xx/vr41xx.h
--- linux-orig/include/asm-mips/vr41xx/vr41xx.h Sat Feb 21 17:13:46 2004
+++ linux/include/asm-mips/vr41xx/vr41xx.h      Sat Feb 21 17:13:54 2004
@@ -151,6 +151,8 @@
 extern void vr41xx_set_tclock_cycle(uint32_t cycles);
 extern uint32_t vr41xx_read_tclock_counter(void);
 
+extern void vr41xx_rtc_init(void);
+
 /*
  * General-Purpose I/O Unit
  */
@@ -226,11 +228,5 @@
 };
 
 extern void vr41xx_pciu_init(struct vr41xx_pci_address_map *map);
-
-/*
- * MISC
- */
-extern void vr41xx_time_init(void);
-extern void vr41xx_timer_setup(struct irqaction *irq);
 
 #endif /* __NEC_VR41XX_H */

<Prev in Thread] Current Thread [Next in Thread>