---

yaml --- r: 139957 b: refs/heads/master c: bf08d52 h: refs/heads/master i: 139955: 114e47f v: v3
git-mirror · Mar 24, 2009 · 28f5d89 · 28f5d89
1 parent f9eebc1
commit 28f5d89
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 41 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a4048a211513c3d6c56ddf2efb276113eae0b80
+refs/heads/master: bf08d5251840ee7fe7ac561fc65aeead4f31335b
diff --git a/trunk/arch/m68k/include/asm/mc146818rtc.h b/trunk/arch/m68k/include/asm/mc146818rtc.h
@@ -1,5 +1,26 @@
-#ifdef __uClinux__
-#include "mc146818rtc_no.h"
-#else
-#include "mc146818rtc_mm.h"
-#endif
+/*
+ * Machine dependent access functions for RTC registers.
+ */
+#ifndef _ASM_MC146818RTC_H
+#define _ASM_MC146818RTC_H
+
+
+#ifdef CONFIG_ATARI
+/* RTC in Atari machines */
+
+#include <asm/atarihw.h>
+
+#define RTC_PORT(x)	(TT_RTC_BAS + 2*(x))
+#define RTC_ALWAYS_BCD	0
+
+#define CMOS_READ(addr) ({ \
+atari_outb_p((addr),RTC_PORT(0)); \
+atari_inb_p(RTC_PORT(1)); \
+})
+#define CMOS_WRITE(val, addr) ({ \
+atari_outb_p((addr),RTC_PORT(0)); \
+atari_outb_p((val),RTC_PORT(1)); \
+})
+#endif /* CONFIG_ATARI */
+
+#endif /* _ASM_MC146818RTC_H */
diff --git a/trunk/arch/m68k/include/asm/mc146818rtc_mm.h b/trunk/arch/m68k/include/asm/mc146818rtc_mm.h
diff --git a/trunk/arch/m68k/include/asm/mc146818rtc_no.h b/trunk/arch/m68k/include/asm/mc146818rtc_no.h