From: Len Brown <len.brown@intel.com>
Date: Fri, 9 Jan 2009 08:36:32 +0000 (-0500)
Subject: Merge branch 'alarm' into release
X-Git-Tag: v2.6.29-rc1~34^2~10
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=38f64c771bece2cdbd72ed733e6fc8f2e279a7c1;p=linux-2.6-omap-h63xx.git

Merge branch 'alarm' into release
---

38f64c771bece2cdbd72ed733e6fc8f2e279a7c1
diff --cc drivers/acpi/proc.c
index 1c4851ff265,2d0e6b57750..428c911dba0
--- a/drivers/acpi/proc.c
+++ b/drivers/acpi/proc.c
@@@ -91,27 -96,33 +94,31 @@@ static int acpi_system_alarm_seq_show(s
  	unsigned char rtc_control = 0;
  	unsigned long flags;
  
 -	ACPI_FUNCTION_TRACE("acpi_system_alarm_seq_show");
 -
  	spin_lock_irqsave(&rtc_lock, flags);
  
- 	sec = CMOS_READ(RTC_SECONDS_ALARM);
- 	min = CMOS_READ(RTC_MINUTES_ALARM);
- 	hr = CMOS_READ(RTC_HOURS_ALARM);
  	rtc_control = CMOS_READ(RTC_CONTROL);
+ 	sec = cmos_bcd_read(RTC_SECONDS_ALARM, rtc_control);
+ 	min = cmos_bcd_read(RTC_MINUTES_ALARM, rtc_control);
+ 	hr = cmos_bcd_read(RTC_HOURS_ALARM, rtc_control);
  
  	/* If we ever get an FACP with proper values... */
- 	if (acpi_gbl_FADT.day_alarm)
+ 	if (acpi_gbl_FADT.day_alarm) {
  		/* ACPI spec: only low 6 its should be cared */
  		day = CMOS_READ(acpi_gbl_FADT.day_alarm) & 0x3F;
- 	else
- 		day = CMOS_READ(RTC_DAY_OF_MONTH);
+ 		if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
+ 			day = bcd2bin(day);
+ 	} else
+ 		day = cmos_bcd_read(RTC_DAY_OF_MONTH, rtc_control);
  	if (acpi_gbl_FADT.month_alarm)
- 		mo = CMOS_READ(acpi_gbl_FADT.month_alarm);
- 	else
- 		mo = CMOS_READ(RTC_MONTH);
+ 		mo = cmos_bcd_read(acpi_gbl_FADT.month_alarm, rtc_control);
+ 	else {
+ 		mo = cmos_bcd_read(RTC_MONTH, rtc_control);
+ 		today = cmos_bcd_read(RTC_DAY_OF_MONTH, rtc_control);
+ 	}
  	if (acpi_gbl_FADT.century)
- 		cent = CMOS_READ(acpi_gbl_FADT.century);
+ 		cent = cmos_bcd_read(acpi_gbl_FADT.century, rtc_control);
  
- 	yr = CMOS_READ(RTC_YEAR);
+ 	yr = cmos_bcd_read(RTC_YEAR, rtc_control);
  
  	spin_unlock_irqrestore(&rtc_lock, flags);