patch-2.4.22 linux-2.4.22/arch/mips/ite-boards/generic/it8172_setup.c
Next file: linux-2.4.22/arch/mips/ite-boards/generic/lpc.c
Previous file: linux-2.4.22/arch/mips/ite-boards/generic/it8172_rtc.c
Back to the patch index
Back to the overall index
- Lines: 111
- Date:
2003-08-25 04:44:40.000000000 -0700
- Orig file:
linux-2.4.21/arch/mips/ite-boards/generic/it8172_setup.c
- Orig date:
2002-08-02 17:39:43.000000000 -0700
diff -urN linux-2.4.21/arch/mips/ite-boards/generic/it8172_setup.c linux-2.4.22/arch/mips/ite-boards/generic/it8172_setup.c
@@ -32,14 +32,16 @@
#include <linux/sched.h>
#include <linux/ioport.h>
#include <linux/console.h>
-#include <linux/mc146818rtc.h>
#include <linux/serial_reg.h>
#include <asm/cpu.h>
#include <asm/bootinfo.h>
#include <asm/irq.h>
+#include <asm/time.h>
+#include <asm/io.h>
#include <asm/mipsregs.h>
#include <asm/reboot.h>
+#include <asm/traps.h>
#include <asm/it8172/it8172.h>
#include <asm/it8712.h>
#ifdef CONFIG_PC_KEYB
@@ -51,7 +53,6 @@
char serial_console[20];
#endif
-extern struct rtc_ops it8172_rtc_ops;
extern struct resource ioport_resource;
#ifdef CONFIG_BLK_DEV_IDE
extern struct ide_ops std_ide_ops;
@@ -71,11 +72,8 @@
extern void (*board_time_init)(void);
extern void (*board_timer_setup)(struct irqaction *irq);
-extern unsigned long (*rtc_get_time)(void);
-extern int (*rtc_set_time)(unsigned long);
extern void it8172_time_init(void);
extern void it8172_timer_setup(struct irqaction *irq);
-extern unsigned long it8172_rtc_get_time(void);
#ifdef CONFIG_IT8172_REVC
struct {
@@ -131,22 +129,19 @@
argptr = prom_getcmdline();
strcat(argptr, " console=ttyS0,115200");
}
-#endif
+#endif
- clear_cp0_status(ST0_FR);
- rtc_ops = &it8172_rtc_ops;
+ clear_c0_status(ST0_FR);
board_time_init = it8172_time_init;
board_timer_setup = it8172_timer_setup;
- rtc_get_time = it8172_rtc_get_time;
- //rtc_set_time = it8172_rtc_set_time;
_machine_restart = it8172_restart;
_machine_halt = it8172_halt;
_machine_power_off = it8172_power_off;
/*
- * IO/MEM resources.
+ * IO/MEM resources.
*
* revisit this area.
*/
@@ -173,7 +168,7 @@
dsr &= ~IT_PM_DSR_ACSB;
#else
dsr |= IT_PM_DSR_ACSB;
-#endif
+#endif
#ifdef CONFIG_BLK_DEV_IT8172
dsr &= ~IT_PM_DSR_IDESB;
ide_ops = &std_ide_ops;
@@ -209,8 +204,8 @@
LPCSetConfig(0x4, 0x30, 0x1);
LPCSetConfig(0x4, 0xf4, LPCGetConfig(0x4, 0xf4) | 0x80);
- if ((LPCGetConfig(LDN_KEYBOARD, 0x30) == 0) ||
- (LPCGetConfig(LDN_MOUSE, 0x30) == 0))
+ if ((LPCGetConfig(LDN_KEYBOARD, 0x30) == 0) ||
+ (LPCGetConfig(LDN_MOUSE, 0x30) == 0))
printk("Error: keyboard or mouse not enabled\n");
kbd_ops = &std_kbd_ops;
@@ -234,7 +229,7 @@
#endif
#ifdef CONFIG_IT8172_SCR0
{
- unsigned i;
+ unsigned i;
/* Enable Smart Card Reader 0 */
/* First power it up */
IT_IO_READ16(IT_PM_DSR, i);
@@ -253,7 +248,7 @@
#endif /* CONFIG_IT8172_SCR0 */
#ifdef CONFIG_IT8172_SCR1
{
- unsigned i;
+ unsigned i;
/* Enable Smart Card Reader 1 */
/* First power it up */
IT_IO_READ16(IT_PM_DSR, i);
@@ -275,7 +270,7 @@
#ifdef CONFIG_PC_KEYB
/*
- * According to the ITE Special BIOS Note for waking up the
+ * According to the ITE Special BIOS Note for waking up the
* keyboard controller...
*/
int init_8712_keyboard()
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)