diff options
author | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2007-08-25 05:01:50 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-10-11 18:46:00 -0400 |
commit | ea202c632a52c4a83f1bd82d8d06bc8e04f2689a (patch) | |
tree | 1815b69d45b99d8f20d0fb33ba7b34b8319f2507 /include/asm-mips/mach-jazz/mc146818rtc.h | |
parent | 1f21d2bde0046e959b53756f74d96dfd040a803b (diff) |
[MIPS] JAZZ fixes
- restructured irq handling
- switched vdma to use memory allocated via get_free_pages
- setup platform devices for serial, jazz_esp and jazzsonic
- fixed cmos rtc access
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'include/asm-mips/mach-jazz/mc146818rtc.h')
-rw-r--r-- | include/asm-mips/mach-jazz/mc146818rtc.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/asm-mips/mach-jazz/mc146818rtc.h b/include/asm-mips/mach-jazz/mc146818rtc.h index f44fdba1998b..987f727afe25 100644 --- a/include/asm-mips/mach-jazz/mc146818rtc.h +++ b/include/asm-mips/mach-jazz/mc146818rtc.h | |||
@@ -4,12 +4,15 @@ | |||
4 | * for more details. | 4 | * for more details. |
5 | * | 5 | * |
6 | * Copyright (C) 1998, 2001, 03 by Ralf Baechle | 6 | * Copyright (C) 1998, 2001, 03 by Ralf Baechle |
7 | * Copyright (C) 2007 Thomas Bogendoerfer | ||
7 | * | 8 | * |
8 | * RTC routines for Jazz style attached Dallas chip. | 9 | * RTC routines for Jazz style attached Dallas chip. |
9 | */ | 10 | */ |
10 | #ifndef __ASM_MACH_JAZZ_MC146818RTC_H | 11 | #ifndef __ASM_MACH_JAZZ_MC146818RTC_H |
11 | #define __ASM_MACH_JAZZ_MC146818RTC_H | 12 | #define __ASM_MACH_JAZZ_MC146818RTC_H |
12 | 13 | ||
14 | #include <linux/delay.h> | ||
15 | |||
13 | #include <asm/io.h> | 16 | #include <asm/io.h> |
14 | #include <asm/jazz.h> | 17 | #include <asm/jazz.h> |
15 | 18 | ||
@@ -19,16 +22,17 @@ | |||
19 | static inline unsigned char CMOS_READ(unsigned long addr) | 22 | static inline unsigned char CMOS_READ(unsigned long addr) |
20 | { | 23 | { |
21 | outb_p(addr, RTC_PORT(0)); | 24 | outb_p(addr, RTC_PORT(0)); |
22 | 25 | return *(volatile char *)JAZZ_RTC_BASE; | |
23 | return *(char *)JAZZ_RTC_BASE; | ||
24 | } | 26 | } |
25 | 27 | ||
26 | static inline void CMOS_WRITE(unsigned char data, unsigned long addr) | 28 | static inline void CMOS_WRITE(unsigned char data, unsigned long addr) |
27 | { | 29 | { |
28 | outb_p(addr, RTC_PORT(0)); | 30 | outb_p(addr, RTC_PORT(0)); |
29 | *(char *)JAZZ_RTC_BASE = data; | 31 | *(volatile char *)JAZZ_RTC_BASE = data; |
30 | } | 32 | } |
31 | 33 | ||
32 | #define RTC_ALWAYS_BCD 0 | 34 | #define RTC_ALWAYS_BCD 0 |
33 | 35 | ||
36 | #define mc146818_decode_year(year) ((year) + 1980) | ||
37 | |||
34 | #endif /* __ASM_MACH_JAZZ_MC146818RTC_H */ | 38 | #endif /* __ASM_MACH_JAZZ_MC146818RTC_H */ |