The patch titled
Subject: rtc: omap: add helper to read raw bcd time
has been removed from the -mm tree. Its filename was
rtc-omap-add-helper-to-read-raw-bcd-time.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Johan Hovold <johan@xxxxxxxxxx>
Subject: rtc: omap: add helper to read raw bcd time
Add helper to read raw BCD time that can be used in interrupt context.
Signed-off-by: Johan Hovold <johan@xxxxxxxxxx>
Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Cc: Tony Lindgren <tony@xxxxxxxxxxx>
Cc: Benot Cousson <bcousson@xxxxxxxxxxxx>
Cc: Lokesh Vutla <lokeshvutla@xxxxxx>
Cc: Guenter Roeck <linux@xxxxxxxxxxxx>
Cc: Sekhar Nori <nsekhar@xxxxxx>
Cc: Tero Kristo <t-kristo@xxxxxx>
Cc: Keerthy J <j-keerthy@xxxxxx>
Tested-by: Felipe Balbi <balbi@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/rtc/rtc-omap.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff -puN drivers/rtc/rtc-omap.c~rtc-omap-add-helper-to-read-raw-bcd-time drivers/rtc/rtc-omap.c
--- a/drivers/rtc/rtc-omap.c~rtc-omap-add-helper-to-read-raw-bcd-time
+++ a/drivers/rtc/rtc-omap.c
@@ -234,22 +234,24 @@ static void bcd2tm(struct rtc_time *tm)
tm->tm_year = bcd2bin(tm->tm_year) + 100;
}
-
-static int omap_rtc_read_time(struct device *dev, struct rtc_time *tm)
+static void omap_rtc_read_time_raw(struct omap_rtc *rtc, struct rtc_time *tm)
{
- struct omap_rtc *rtc = dev_get_drvdata(dev);
-
- /* we don't report wday/yday/isdst ... */
- local_irq_disable();
- rtc_wait_not_busy(rtc);
-
tm->tm_sec = rtc_read(rtc, OMAP_RTC_SECONDS_REG);
tm->tm_min = rtc_read(rtc, OMAP_RTC_MINUTES_REG);
tm->tm_hour = rtc_read(rtc, OMAP_RTC_HOURS_REG);
tm->tm_mday = rtc_read(rtc, OMAP_RTC_DAYS_REG);
tm->tm_mon = rtc_read(rtc, OMAP_RTC_MONTHS_REG);
tm->tm_year = rtc_read(rtc, OMAP_RTC_YEARS_REG);
+}
+
+static int omap_rtc_read_time(struct device *dev, struct rtc_time *tm)
+{
+ struct omap_rtc *rtc = dev_get_drvdata(dev);
+ /* we don't report wday/yday/isdst ... */
+ local_irq_disable();
+ rtc_wait_not_busy(rtc);
+ omap_rtc_read_time_raw(rtc, tm);
local_irq_enable();
bcd2tm(tm);
_
Patches currently in -mm which might be from johan@xxxxxxxxxx are
origin.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
