From 6d2c293d6578048e7b71e0c44897144f15f350ae Mon Sep 17 00:00:00 2001 From: merging other branches Date: Wed, 26 Nov 2008 16:07:01 +0000 Subject: MERGE-via-balaji-tracking-hist-MERGE-via-stable-tracking-hist-MERGE-via-mokopatches-tracking-via-master-s3c-hsmmc-clean balaji-tracking-hist top was efb2d57c0e0ed62324d79d6c5793fe797c157266 --- drivers/rtc/Kconfig | 6 + drivers/rtc/Makefile | 1 + drivers/rtc/rtc-pcf50606.c | 297 +++++++++++++++++++++++++++++++++++++++++++++ drivers/rtc/rtc-pcf50633.c | 24 ++-- 4 files changed, 315 insertions(+), 13 deletions(-) create mode 100644 drivers/rtc/rtc-pcf50606.c (limited to 'drivers/rtc') diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index c7108a4d613..cc3c077df37 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -225,6 +225,12 @@ config RTC_DRV_PCF50633 If you say yes here you get support for the Philips PCF50633 PMU's RTC. +config RTC_DRV_PCF50606 + tristate "Philips PCF50606" + help + If you say yes here you get support for the Philips PCF50606 + PMU's RTC. + config RTC_DRV_M41T80 tristate "ST M41T65/M41T80/81/82/83/84/85/87" help diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index ab3a003991e..50f337b338f 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -50,6 +50,7 @@ obj-$(CONFIG_RTC_DRV_OMAP) += rtc-omap.o obj-$(CONFIG_RTC_DRV_PCF8563) += rtc-pcf8563.o obj-$(CONFIG_RTC_DRV_PCF8583) += rtc-pcf8583.o obj-$(CONFIG_RTC_DRV_PCF50633) += rtc-pcf50633.o +obj-$(CONFIG_RTC_DRV_PCF50606) += rtc-pcf50606.o obj-$(CONFIG_RTC_DRV_PL030) += rtc-pl030.o obj-$(CONFIG_RTC_DRV_PL031) += rtc-pl031.o obj-$(CONFIG_RTC_DRV_PARISC) += rtc-parisc.o diff --git a/drivers/rtc/rtc-pcf50606.c b/drivers/rtc/rtc-pcf50606.c new file mode 100644 index 00000000000..498ec77c82f --- /dev/null +++ b/drivers/rtc/rtc-pcf50606.c @@ -0,0 +1,297 @@ +/* Philips PCF50606 RTC Driver + * + * (C) 2006-2008 by Openmoko, Inc. + * Author: Balaji Rao + * All rights reserved. + * + * Broken down from monstrous PCF50606 driver mainly by + * Harald Welte, Andy Green and Werner Almesberger + * + * 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 060, Boston, + * MA 02111-1307 USA + */ + +#include +#include +#include + +#include +#include + +enum pcf50606_time_indexes { + PCF50606_TI_SEC = 0, + PCF50606_TI_MIN, + PCF50606_TI_HOUR, + PCF50606_TI_WKDAY, + PCF50606_TI_DAY, + PCF50606_TI_MONTH, + PCF50606_TI_YEAR, + PCF50606_TI_EXTENT /* always last */ +}; + + +struct pcf50606_time { + u_int8_t time[PCF50606_TI_EXTENT]; +}; + +static void pcf2rtc_time(struct rtc_time *rtc, struct pcf50606_time *pcf) +{ + rtc->tm_sec = bcd2bin(pcf->time[PCF50606_TI_SEC]); + rtc->tm_min = bcd2bin(pcf->time[PCF50606_TI_MIN]); + rtc->tm_hour = bcd2bin(pcf->time[PCF50606_TI_HOUR]); + rtc->tm_wday = bcd2bin(pcf->time[PCF50606_TI_WKDAY]); + rtc->tm_mday = bcd2bin(pcf->time[PCF50606_TI_DAY]); + rtc->tm_mon = bcd2bin(pcf->time[PCF50606_TI_MONTH]); + rtc->tm_year = bcd2bin(pcf->time[PCF50606_TI_YEAR]) + 100; +} + +static void rtc2pcf_time(struct pcf50606_time *pcf, struct rtc_time *rtc) +{ + pcf->time[PCF50606_TI_SEC] = bin2bcd(rtc->tm_sec); + pcf->time[PCF50606_TI_MIN] = bin2bcd(rtc->tm_min); + pcf->time[PCF50606_TI_HOUR] = bin2bcd(rtc->tm_hour); + pcf->time[PCF50606_TI_WKDAY] = bin2bcd(rtc->tm_wday); + pcf->time[PCF50606_TI_DAY] = bin2bcd(rtc->tm_mday); + pcf->time[PCF50606_TI_MONTH] = bin2bcd(rtc->tm_mon); + pcf->time[PCF50606_TI_YEAR] = bin2bcd(rtc->tm_year - 100); +} + +static int pcf50606_rtc_ioctl(struct device *dev, unsigned int cmd, + unsigned long arg) +{ + struct pcf50606 *pcf; + + pcf = dev_get_drvdata(dev); + + switch (cmd) { + case RTC_AIE_OFF: + /* disable the alarm interrupt */ + pcf->rtc.alarm_enabled = 0; + pcf50606_irq_mask(pcf, PCF50606_IRQ_ALARM); + return 0; + case RTC_AIE_ON: + /* enable the alarm interrupt */ + pcf->rtc.alarm_enabled = 1; + pcf50606_irq_unmask(pcf, PCF50606_IRQ_ALARM); + return 0; + case RTC_PIE_OFF: + /* disable periodic interrupt (hz tick) */ + pcf->rtc.second_enabled = 0; + pcf50606_irq_mask(pcf, PCF50606_IRQ_SECOND); + return 0; + case RTC_PIE_ON: + /* ensable periodic interrupt (hz tick) */ + pcf->rtc.second_enabled = 1; + pcf50606_irq_unmask(pcf, PCF50606_IRQ_SECOND); + return 0; + } + return -ENOIOCTLCMD; +} + +static int pcf50606_rtc_read_time(struct device *dev, struct rtc_time *tm) +{ + struct pcf50606 *pcf; + struct pcf50606_time pcf_tm; + int ret; + + pcf = dev_get_drvdata(dev); + + ret = pcf50606_read_block(pcf, PCF50606_REG_RTCSC, + PCF50606_TI_EXTENT, + &pcf_tm.time[0]); + if (ret != PCF50606_TI_EXTENT) + dev_err(dev, "Failed to read time\n"); + + dev_dbg(dev, "PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n", + pcf_tm.time[PCF50606_TI_DAY], + pcf_tm.time[PCF50606_TI_MONTH], + pcf_tm.time[PCF50606_TI_YEAR], + pcf_tm.time[PCF50606_TI_HOUR], + pcf_tm.time[PCF50606_TI_MIN], + pcf_tm.time[PCF50606_TI_SEC]); + + pcf2rtc_time(tm, &pcf_tm); + + dev_dbg(dev, "RTC_TIME: %u.%u.%u %u:%u:%u\n", + tm->tm_mday, tm->tm_mon, tm->tm_year, + tm->tm_hour, tm->tm_min, tm->tm_sec); + + return 0; +} + +static int pcf50606_rtc_set_time(struct device *dev, struct rtc_time *tm) +{ + struct pcf50606 *pcf; + struct pcf50606_time pcf_tm; + int ret; + int second_masked, alarm_masked; + + pcf = dev_get_drvdata(dev); + + dev_dbg(dev, "RTC_TIME: %u.%u.%u %u:%u:%u\n", + tm->tm_mday, tm->tm_mon, tm->tm_year, + tm->tm_hour, tm->tm_min, tm->tm_sec); + rtc2pcf_time(&pcf_tm, tm); + dev_dbg(dev, "PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n", + pcf_tm.time[PCF50606_TI_DAY], + pcf_tm.time[PCF50606_TI_MONTH], + pcf_tm.time[PCF50606_TI_YEAR], + pcf_tm.time[PCF50606_TI_HOUR], + pcf_tm.time[PCF50606_TI_MIN], + pcf_tm.time[PCF50606_TI_SEC]); + + + second_masked = pcf50606_irq_mask_get(pcf, PCF50606_IRQ_SECOND); + alarm_masked = pcf50606_irq_mask_get(pcf, PCF50606_IRQ_ALARM); + + if (!second_masked) + pcf50606_irq_mask(pcf, PCF50606_IRQ_SECOND); + if (!alarm_masked) + pcf50606_irq_mask(pcf, PCF50606_IRQ_ALARM); + + ret = pcf50606_write_block(pcf, PCF50606_REG_RTCSC, + PCF50606_TI_EXTENT, + &pcf_tm.time[0]); + if (ret) + dev_err(dev, "Failed to set time %d\n", ret); + + if (!second_masked) + pcf50606_irq_unmask(pcf, PCF50606_IRQ_SECOND); + if (!alarm_masked) + pcf50606_irq_unmask(pcf, PCF50606_IRQ_ALARM); + + + return 0; +} + +static int pcf50606_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) +{ + struct pcf50606 *pcf; + struct pcf50606_time pcf_tm; + int ret; + + pcf = dev_get_drvdata(dev); + + alrm->enabled = pcf->rtc.alarm_enabled; + + ret = pcf50606_read_block(pcf, PCF50606_REG_RTCSCA, + PCF50606_TI_EXTENT, &pcf_tm.time[0]); + + if (ret != PCF50606_TI_EXTENT) + dev_err(dev, "Failed to read Alarm time :-(\n"); + + pcf2rtc_time(&alrm->time, &pcf_tm); + + return 0; +} + +static int pcf50606_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) +{ + struct pcf50606 *pcf; + struct pcf50606_time pcf_tm; + int ret, alarm_masked; + + pcf = dev_get_drvdata(dev); + + rtc2pcf_time(&pcf_tm, &alrm->time); + + alarm_masked = pcf50606_irq_mask_get(pcf, PCF50606_IRQ_ALARM); + + /* disable alarm interrupt */ + if (!alarm_masked) + pcf50606_irq_mask(pcf, PCF50606_IRQ_ALARM); + + ret = pcf50606_write_block(pcf, PCF50606_REG_RTCSCA, + PCF50606_TI_EXTENT, &pcf_tm.time[0]); + if (ret) + dev_err(dev, "Failed to write alarm time %d\n", ret); + + if (!alarm_masked) + pcf50606_irq_unmask(pcf, PCF50606_IRQ_ALARM); + + return 0; +} +static struct rtc_class_ops pcf50606_rtc_ops = { + .ioctl = pcf50606_rtc_ioctl, + .read_time = pcf50606_rtc_read_time, + .set_time = pcf50606_rtc_set_time, + .read_alarm = pcf50606_rtc_read_alarm, + .set_alarm = pcf50606_rtc_set_alarm, +}; + +static void pcf50606_rtc_irq(struct pcf50606 *pcf, int irq, void *unused) +{ + switch (irq) { + case PCF50606_IRQ_ALARM: + rtc_update_irq(pcf->rtc.rtc_dev, 1, RTC_AF | RTC_IRQF); + break; + case PCF50606_IRQ_SECOND: + rtc_update_irq(pcf->rtc.rtc_dev, 1, RTC_PF | RTC_IRQF); + break; + } +} + +static int pcf50606_rtc_probe(struct platform_device *pdev) +{ + struct rtc_device *rtc; + struct pcf50606 *pcf; + + rtc = rtc_device_register("pcf50606", &pdev->dev, + &pcf50606_rtc_ops, THIS_MODULE); + if (IS_ERR(rtc)) + return -ENODEV; + + pcf = platform_get_drvdata(pdev); + + /* Set up IRQ handlers */ + pcf->irq_handler[PCF50606_IRQ_ALARM].handler = pcf50606_rtc_irq; + pcf->irq_handler[PCF50606_IRQ_SECOND].handler = pcf50606_rtc_irq; + + pcf->rtc.rtc_dev = rtc; + + return 0; +} + +static int pcf50606_rtc_remove(struct platform_device *pdev) +{ + return 0; +} + + +static struct platform_driver pcf50606_rtc_driver = { + .driver = { + .name = "pcf50606-rtc", + }, + .probe = pcf50606_rtc_probe, + .remove = __devexit_p(pcf50606_rtc_remove), +}; + +static int __init pcf50606_rtc_init(void) +{ + return platform_driver_register(&pcf50606_rtc_driver); +} +module_init(pcf50606_rtc_init); + +static void __exit pcf50606_rtc_exit(void) +{ + platform_driver_unregister(&pcf50606_rtc_driver); +} +module_exit(pcf50606_rtc_exit); + + +MODULE_DESCRIPTION("RTC driver for NXP PCF50606 power management unit"); +MODULE_AUTHOR("Balaji Rao "); +MODULE_LICENSE("GPL"); + diff --git a/drivers/rtc/rtc-pcf50633.c b/drivers/rtc/rtc-pcf50633.c index bd99be1837a..00b159920b4 100644 --- a/drivers/rtc/rtc-pcf50633.c +++ b/drivers/rtc/rtc-pcf50633.c @@ -5,7 +5,7 @@ * All rights reserved. * * Broken down from monstrous PCF50633 driver mainly by - * Harald Welte and Andy Green + * Harald Welte, Andy Green and Werner Almesberger * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -207,9 +207,6 @@ static int pcf50633_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) rtc2pcf_time(&pcf_tm, &alrm->time); - printk("wkday is %x\n", alrm->time.tm_wday); - printk("wkday is %x\n", pcf_tm.time[PCF50633_TI_WKDAY]); - alarm_masked = pcf50633_irq_mask_get(pcf, PCF50633_IRQ_ALARM); /* disable alarm interrupt */ @@ -236,13 +233,13 @@ static struct rtc_class_ops pcf50633_rtc_ops = { static void pcf50633_rtc_irq(struct pcf50633 *pcf, int irq, void *unused) { - switch(irq) { - 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; + switch (irq) { + 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; } } @@ -250,12 +247,12 @@ static int pcf50633_rtc_probe(struct platform_device *pdev) { struct rtc_device *rtc; struct pcf50633 *pcf; - + rtc = rtc_device_register("pcf50633", &pdev->dev, &pcf50633_rtc_ops, THIS_MODULE); if (IS_ERR(rtc)) return -ENODEV; - + pcf = platform_get_drvdata(pdev); /* Set up IRQ handlers */ @@ -263,6 +260,7 @@ static int pcf50633_rtc_probe(struct platform_device *pdev) pcf->irq_handler[PCF50633_IRQ_SECOND].handler = pcf50633_rtc_irq; pcf->rtc.rtc_dev = rtc; + return 0; } -- cgit v1.2.3