From: Matt Mackall Signed-off-by: Matt Mackall Cc: Russell King Cc: Alessandro Zummo Signed-off-by: Andrew Morton --- arch/arm/mach-footbridge/time.c | 17 +---------------- 1 files changed, 1 insertion(+), 16 deletions(-) diff -puN arch/arm/mach-footbridge/time.c~rtc-remove-rtc-uip-synchronization-on-arm arch/arm/mach-footbridge/time.c --- devel/arch/arm/mach-footbridge/time.c~rtc-remove-rtc-uip-synchronization-on-arm 2006-03-17 22:01:23.000000000 -0800 +++ devel-akpm/arch/arm/mach-footbridge/time.c 2006-03-17 22:01:23.000000000 -0800 @@ -34,27 +34,12 @@ static int rtc_base; static unsigned long __init get_isa_cmos_time(void) { unsigned int year, mon, day, hour, min, sec; - int i; // check to see if the RTC makes sense..... if ((CMOS_READ(RTC_VALID) & RTC_VRT) == 0) return mktime(1970, 1, 1, 0, 0, 0); - /* The Linux interpretation of the CMOS clock register contents: - * When the Update-In-Progress (UIP) flag goes from 1 to 0, the - * RTC registers show the second which has precisely just started. - * Let's hope other operating systems interpret the RTC the same way. - */ - /* read RTC exactly on falling edge of update flag */ - for (i = 0 ; i < 1000000 ; i++) /* may take up to 1 second... */ - if (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP) - break; - - for (i = 0 ; i < 1000000 ; i++) /* must try at least 2.228 ms */ - if (!(CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP)) - break; - - do { /* Isn't this overkill ? UIP above should guarantee consistency */ + do { sec = CMOS_READ(RTC_SECONDS); min = CMOS_READ(RTC_MINUTES); hour = CMOS_READ(RTC_HOURS); _