Commit 49fa3c08 authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer Committed by Ralf Baechle

[MIPS] SNI: Fix mc146818_decode_year

Big endian RMs uses a different mc146818_decode_year than little endian RMs
Correct mc146818_decode_year for years before 2000
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 821d313c
...@@ -55,6 +55,6 @@ static inline void CMOS_WRITE(unsigned char data, unsigned long addr) ...@@ -55,6 +55,6 @@ static inline void CMOS_WRITE(unsigned char data, unsigned long addr)
#define RTC_ALWAYS_BCD 0 #define RTC_ALWAYS_BCD 0
#define mc146818_decode_year(year) ((year) < 70 ? (year) + 2000 : (year) + 1970) #define mc146818_decode_year(year) ((year) < 70 ? (year) + 2000 : (year) + 1900)
#endif /* __ASM_MACH_ATLAS_MC146818RTC_H */ #endif /* __ASM_MACH_ATLAS_MC146818RTC_H */
...@@ -30,7 +30,7 @@ static inline void CMOS_WRITE(unsigned char data, unsigned long addr) ...@@ -30,7 +30,7 @@ static inline void CMOS_WRITE(unsigned char data, unsigned long addr)
#define RTC_ALWAYS_BCD 1 #define RTC_ALWAYS_BCD 1
#ifndef mc146818_decode_year #ifndef mc146818_decode_year
#define mc146818_decode_year(year) ((year) < 70 ? (year) + 2000 : (year) + 1970) #define mc146818_decode_year(year) ((year) < 70 ? (year) + 2000 : (year) + 1900)
#endif #endif
#endif /* __ASM_MACH_GENERIC_MC146818RTC_H */ #endif /* __ASM_MACH_GENERIC_MC146818RTC_H */
...@@ -43,6 +43,6 @@ static inline void CMOS_WRITE(unsigned char data, unsigned long addr) ...@@ -43,6 +43,6 @@ static inline void CMOS_WRITE(unsigned char data, unsigned long addr)
#define RTC_ALWAYS_BCD 0 #define RTC_ALWAYS_BCD 0
#define mc146818_decode_year(year) ((year) < 70 ? (year) + 2000 : (year) + 1970) #define mc146818_decode_year(year) ((year) < 70 ? (year) + 2000 : (year) + 1900)
#endif /* __ASM_MACH_MALTA_MC146818RTC_H */ #endif /* __ASM_MACH_MALTA_MC146818RTC_H */
...@@ -7,11 +7,15 @@ ...@@ -7,11 +7,15 @@
* *
* RTC routines for PC style attached Dallas chip with ARC epoch. * RTC routines for PC style attached Dallas chip with ARC epoch.
*/ */
#ifndef __ASM_MACH_RM200_MC146818RTC_H #ifndef __ASM_MACH_RM_MC146818RTC_H
#define __ASM_MACH_RM200_MC146818RTC_H #define __ASM_MACH_RM_MC146818RTC_H
#if CONFIG_CPU_BIG_ENDIAN
#define mc146818_decode_year(year) ((year) < 70 ? (year) + 2000 : (year) + 1900)
#else
#define mc146818_decode_year(year) ((year) + 1980) #define mc146818_decode_year(year) ((year) + 1980)
#endif
#include_next <mc146818rtc.h> #include_next <mc146818rtc.h>
#endif /* __ASM_MACH_RM200_MC146818RTC_H */ #endif /* __ASM_MACH_RM_MC146818RTC_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment