diff options
| author | Andy Green <andy@openmoko.com> | 2008-11-21 16:40:58 +0000 |
|---|---|---|
| committer | Andy Green <andy@openmoko.com> | 2008-11-21 16:40:58 +0000 |
| commit | 4a922dc8ab2915b61ff6adfe8e0a01069893b52b (patch) | |
| tree | 6909728173fc18e8a88eaa9aa46eaebffbcabd93 /drivers/rtc | |
| parent | a7e6827348e9e85466c9ab6488769bf862e9fd0b (diff) | |
MERGE-via-balaji-tracking-balaji-updates
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/rtc/rtc-pcf50633.c | 28 |
2 files changed, 29 insertions, 1 deletions
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index e8a1c7c5420..c7108a4d613 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -223,7 +223,7 @@ config RTC_DRV_PCF50633 tristate "Philips PCF50633" help If you say yes here you get support for the Philips PCF50633 - PMU's RTC driver. + PMU's RTC. config RTC_DRV_M41T80 tristate "ST M41T65/M41T80/81/82/83/84/85/87" diff --git a/drivers/rtc/rtc-pcf50633.c b/drivers/rtc/rtc-pcf50633.c index 6b8ef2f4b8a..bd99be1837a 100644 --- a/drivers/rtc/rtc-pcf50633.c +++ b/drivers/rtc/rtc-pcf50633.c @@ -1,3 +1,28 @@ +/* Philips PCF50633 RTC Driver + * + * (C) 2006-2008 by Openmoko, Inc. + * Author: Balaji Rao <balajirrao@openmoko.org> + * All rights reserved. + * + * Broken down from monstrous PCF50633 driver mainly by + * Harald Welte and Andy Green + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + #include <linux/rtc.h> #include <linux/platform_device.h> #include <linux/bcd.h> @@ -215,6 +240,9 @@ static void pcf50633_rtc_irq(struct pcf50633 *pcf, int irq, void *unused) case PCF50633_IRQ_ALARM: rtc_update_irq(pcf->rtc.rtc_dev, 1, RTC_AF | RTC_IRQF); break; + case PCF50633_IRQ_SECOND: + rtc_update_irq(pcf->rtc.rtc_dev, 1, RTC_PF | RTC_IRQF); + break; } } |