patch-2.4.22 linux-2.4.22/arch/mips/sgi-ip22/ip22-rtc.c

• Lines: 40
• Date: 2003-08-25 04:44:40.000000000 -0700
• Orig file: linux-2.4.21/arch/mips/sgi-ip22/ip22-rtc.c
• Orig date: 2002-08-02 17:39:43.000000000 -0700

diff -urN linux-2.4.21/arch/mips/sgi-ip22/ip22-rtc.c linux-2.4.22/arch/mips/sgi-ip22/ip22-rtc.c
@@ -8,29 +8,25 @@
  * Copyright (C) 1998, 2001 by Ralf Baechle
  */
 #include <asm/ds1286.h>
-#include <asm/sgi/sgihpc.h>
+#include <asm/sgi/hpc3.h>
 
-static unsigned char indy_rtc_read_data(unsigned long addr)
+static unsigned char ip22_rtc_read_data(unsigned long addr)
 {
-	volatile unsigned int *rtcregs = (void *)INDY_CLOCK_REGS;
-
-	return rtcregs[addr];
+	return hpc3c0->rtcregs[addr];
 }
 
-static void indy_rtc_write_data(unsigned char data, unsigned long addr)
+static void ip22_rtc_write_data(unsigned char data, unsigned long addr)
 {
-	volatile unsigned int *rtcregs = (void *)INDY_CLOCK_REGS;
-
-	rtcregs[addr] = data;
+	hpc3c0->rtcregs[addr] = data;
 }
 
-static int indy_rtc_bcd_mode(void)
+static int ip22_rtc_bcd_mode(void)
 {
 	return 0;
 }
 
-struct rtc_ops indy_rtc_ops = {
-	&indy_rtc_read_data,
-	&indy_rtc_write_data,
-	&indy_rtc_bcd_mode
+struct rtc_ops ip22_rtc_ops = {
+	&ip22_rtc_read_data,
+	&ip22_rtc_write_data,
+	&ip22_rtc_bcd_mode
 };