From patchwork Tue Jan 25 06:49:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varun Wadekar X-Patchwork-Id: 80327 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-pw0-f56.google.com (mail-pw0-f56.google.com [209.85.160.56]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 199591007D1 for ; Tue, 25 Jan 2011 17:49:43 +1100 (EST) Received: by pwi8 with SMTP id 8sf29490pwi.11 for ; Mon, 24 Jan 2011 22:49:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=beta; h=domainkey-signature:x-beenthere:received-spf:x-pgp-universal :message-id:date:from:organization:user-agent:mime-version:to:cc :subject:references:in-reply-to:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:list-post:list-help:list-archive:sender:list-subscribe :list-unsubscribe:content-type; bh=odCTeXFmpJTVymOg6Xt5UyFXWxZ3VjJqRcpKQQWXGmw=; b=opJ0SAvHt3FgIuy7KN8yKPmbrBJRMkpPgWi+XOkZJiX2RwG14Ad8dxbIYWqhbbCF63 wfR2GdVtOx9qpPkAXqPBtBkqp59JkbqRWjHPXcf/fBa2tZXzdWoTtQZoMQjDq3UeTQEq Am5hTXsgyKTq8PoQRyOgr3sfeTIxpmUOa6zR0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlegroups.com; s=beta; h=x-beenthere:received-spf:x-pgp-universal:message-id:date:from :organization:user-agent:mime-version:to:cc:subject:references :in-reply-to:x-original-sender:x-original-authentication-results :reply-to:precedence:mailing-list:list-id:list-post:list-help :list-archive:sender:list-subscribe:list-unsubscribe:content-type; b=GMnN18JHPrOnUvIxYbklO6ruTZ1OZdlu4q4X4wh6yOAxaSUQnyVwS2vTLnlvJf324n ROVrX2l1RwiytwC+zGfRplkxNOx3baBo3+l3XEszkgD+JjUpemJFVpKtHXs3gHyADJtL V4uU9Kwz3IWGnXiX0xJJWkLpQcbXK2vUIRPIU= Received: by 10.142.246.19 with SMTP id t19mr285048wfh.9.1295938180363; Mon, 24 Jan 2011 22:49:40 -0800 (PST) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.142.97.18 with SMTP id u18ls261469wfb.2.p; Mon, 24 Jan 2011 22:49:39 -0800 (PST) Received: by 10.142.180.5 with SMTP id c5mr1054434wff.74.1295938179702; Mon, 24 Jan 2011 22:49:39 -0800 (PST) Received: by 10.142.180.5 with SMTP id c5mr1054433wff.74.1295938179671; Mon, 24 Jan 2011 22:49:39 -0800 (PST) Received: from hqemgate03.nvidia.com (hqemgate03.nvidia.com [216.228.121.140]) by gmr-mx.google.com with ESMTPS id f13si15285973wfo.4.2011.01.24.22.49.39 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 24 Jan 2011 22:49:39 -0800 (PST) Received-SPF: pass (google.com: domain of vwadekar@nvidia.com designates 216.228.121.140 as permitted sender) client-ip=216.228.121.140; Received: from hqnvupgp03.nvidia.com (Not Verified[172.17.102.18]) by hqemgate03.nvidia.com id ; Mon, 24 Jan 2011 22:56:21 -0800 Received: from hqemhub02.nvidia.com ([172.17.108.22]) by hqnvupgp03.nvidia.com (PGP Universal service); Mon, 24 Jan 2011 22:49:39 -0800 X-PGP-Universal: processed; by hqnvupgp03.nvidia.com on Mon, 24 Jan 2011 22:49:39 -0800 Received: from [10.24.109.4] (172.20.144.16) by hqemhub02.nvidia.com (172.17.98.27) with Microsoft SMTP Server id 8.2.254.0; Mon, 24 Jan 2011 22:49:38 -0800 Message-ID: <4D3E727F.8090105@nvidia.com> Date: Tue, 25 Jan 2011 12:19:35 +0530 From: Varun Wadekar Organization: NVIDIA Corporation User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.13) Gecko/20101208 Lightning/1.0b2 Thunderbird/3.1.7 MIME-Version: 1.0 To: "rtc-linux@googlegroups.com" CC: Alessandro Zummo , "linux-tegra@vger.kernel.org" , Andy Ritger , Stephen Warren , Bharat Nihalani Subject: [rtc-linux] [PATCH v2] mfd: tps6586x: add RTC driver for TI TPS6586x References: <4D3E5731.4000809@nvidia.com> In-Reply-To: X-Original-Sender: vwadekar@nvidia.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vwadekar@nvidia.com designates 216.228.121.140 as permitted sender) smtp.mail=vwadekar@nvidia.com Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: List-Post: , List-Help: , List-Archive: Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , v2: Merged original commits into one and changed the kconfig to depend on MFD_TPS6586X Original-Author: Gary King Signed-off-by: Varun Wadekar --- drivers/rtc/Kconfig | 6 + drivers/rtc/Makefile | 1 + drivers/rtc/rtc-tps6586x.c | 325 ++++++++++++++++++++++++++++++++++++++++++ include/linux/mfd/tps6586x.h | 4 + 4 files changed, 336 insertions(+), 0 deletions(-) create mode 100644 drivers/rtc/rtc-tps6586x.c diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 4941cad..75f8be3 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -297,6 +297,12 @@ config RTC_DRV_DM355EVM help Supports the RTC firmware in the MSP430 on the DM355 EVM. +config RTC_DRV_TPS6586X + tristate "TI TPS6586X RTC" + depends on I2C && MFD_TPS6586X + help + This driver supports TPS6586X RTC + config RTC_DRV_TWL92330 boolean "TI TWL92330/Menelaus" depends on MENELAUS diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index 2afdaf3..e8ff797 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -94,6 +94,7 @@ obj-$(CONFIG_RTC_DRV_STK17TA8) += rtc-stk17ta8.o obj-$(CONFIG_RTC_DRV_STMP) += rtc-stmp3xxx.o obj-$(CONFIG_RTC_DRV_SUN4V) += rtc-sun4v.o obj-$(CONFIG_RTC_DRV_TEST) += rtc-test.o +obj-$(CONFIG_RTC_DRV_TPS6586X) += rtc-tps6586x.o obj-$(CONFIG_RTC_DRV_TWL4030) += rtc-twl.o obj-$(CONFIG_RTC_DRV_TX4939) += rtc-tx4939.o obj-$(CONFIG_RTC_DRV_V3020) += rtc-v3020.o diff --git a/drivers/rtc/rtc-tps6586x.c b/drivers/rtc/rtc-tps6586x.c new file mode 100644 index 0000000..ca6138b --- /dev/null +++ b/drivers/rtc/rtc-tps6586x.c @@ -0,0 +1,325 @@ +/* + * drivers/rtc/rtc-tps6586x.c + * + * RTC driver for TI TPS6586x + * + * Copyright (c) 2010, NVIDIA Corporation. + * + * 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., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#define TPS_EPOCH 2009 + +#define RTC_CTRL 0xc0 +#define RTC_ENABLE (1 << 5) /* enables tick updates */ +#define RTC_HIRES (1 << 4) /* 1Khz or 32Khz updates */ +#define RTC_ALARM1_HI 0xc1 +#define RTC_COUNT4 0xc6 + +struct tps6586x_rtc { + unsigned long epoch_start; + int irq; + bool irq_en; + struct rtc_device *rtc; +}; + +static inline struct device *to_tps6586x_dev(struct device *dev) +{ + return dev->parent; +} + +static int tps6586x_rtc_read_time(struct device *dev, struct rtc_time *tm) +{ + struct tps6586x_rtc *rtc = dev_get_drvdata(dev); + struct device *tps_dev = to_tps6586x_dev(dev); + unsigned long long ticks = 0; + unsigned long seconds; + u8 buff[5]; + int err; + int i; + + err = tps6586x_reads(tps_dev, RTC_COUNT4, sizeof(buff), buff); + if (err < 0) { + dev_err(dev, "failed to read counter\n"); + return err; + } + + for (i = 0; i < sizeof(buff); i++) { + ticks <<= 8; + ticks |= buff[i]; + } + + seconds = ticks >> 10; + + seconds += rtc->epoch_start; + rtc_time_to_tm(seconds, tm); + return rtc_valid_tm(tm); +} + +static int tps6586x_rtc_set_time(struct device *dev, struct rtc_time *tm) +{ + struct tps6586x_rtc *rtc = dev_get_drvdata(dev); + struct device *tps_dev = to_tps6586x_dev(dev); + unsigned long long ticks; + unsigned long seconds; + u8 buff[5]; + int err; + + rtc_tm_to_time(tm, &seconds); + + if (WARN_ON(seconds < rtc->epoch_start)) { + dev_err(dev, "requested time unsupported\n"); + return -EINVAL; + } + + seconds -= rtc->epoch_start; + + ticks = (unsigned long long)seconds << 10; + buff[0] = (ticks >> 32) & 0xff; + buff[1] = (ticks >> 24) & 0xff; + buff[2] = (ticks >> 16) & 0xff; + buff[3] = (ticks >> 8) & 0xff; + buff[4] = ticks & 0xff; + + err = tps6586x_clr_bits(tps_dev, RTC_CTRL, RTC_ENABLE); + if (err < 0) { + dev_err(dev, "failed to clear RTC_ENABLE\n"); + return err; + } + + err = tps6586x_writes(tps_dev, RTC_COUNT4, sizeof(buff), buff); + if (err < 0) { + dev_err(dev, "failed to program new time\n"); + return err; + } + + err = tps6586x_set_bits(tps_dev, RTC_CTRL, RTC_ENABLE); + if (err < 0) { + dev_err(dev, "failed to set RTC_ENABLE\n"); + return err; + } + + return 0; +} + +static int tps6586x_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) +{ + struct tps6586x_rtc *rtc = dev_get_drvdata(dev); + struct device *tps_dev = to_tps6586x_dev(dev); + unsigned long seconds; + unsigned long ticks; + u8 buff[3]; + int err; + + if (rtc->irq == -1) + return -EIO; + + rtc_tm_to_time(&alrm->time, &seconds); + + if (WARN_ON(alrm->enabled && (seconds < rtc->epoch_start))) { + dev_err(dev, "can't set alarm to requested time\n"); + return -EINVAL; + } + + if (rtc->irq_en && rtc->irq_en && (rtc->irq != -1)) { + disable_irq(rtc->irq); + rtc->irq_en = false; + } + + seconds -= rtc->epoch_start; + ticks = (unsigned long long)seconds << 10; + + buff[0] = (ticks >> 16) & 0xff; + buff[1] = (ticks >> 8) & 0xff; + buff[2] = ticks & 0xff; + + err = tps6586x_writes(tps_dev, RTC_ALARM1_HI, sizeof(buff), buff); + if (err) { + dev_err(tps_dev, "unable to program alarm\n"); + return err; + } + + if (alrm->enabled && (rtc->irq != -1)) { + enable_irq(rtc->irq); + rtc->irq_en = true; + } + + return err; +} + +static int tps6586x_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) +{ + struct tps6586x_rtc *rtc = dev_get_drvdata(dev); + struct device *tps_dev = to_tps6586x_dev(dev); + unsigned long ticks; + unsigned long seconds; + u8 buff[3]; + int err; + + err = tps6586x_reads(tps_dev, RTC_ALARM1_HI, sizeof(buff), buff); + if (err) + return err; + + ticks = (buff[0] << 16) | (buff[1] << 8) | buff[2]; + seconds = ticks >> 10; + seconds += rtc->epoch_start; + + rtc_time_to_tm(seconds, &alrm->time); + alrm->enabled = rtc->irq_en; + + return 0; +} + +static int tps6586x_rtc_update_irq_enable(struct device *dev, + unsigned int enabled) +{ + struct tps6586x_rtc *rtc = dev_get_drvdata(dev); + + if (rtc->irq == -1) + return -EIO; + + enabled = !!enabled; + if (enabled == rtc->irq_en) + return 0; + + if (enabled) + enable_irq(rtc->irq); + else + disable_irq(rtc->irq); + + rtc->irq_en = enabled; + return 0; +} + +static const struct rtc_class_ops tps6586x_rtc_ops = { + .read_time = tps6586x_rtc_read_time, + .set_time = tps6586x_rtc_set_time, + .set_alarm = tps6586x_rtc_set_alarm, + .read_alarm = tps6586x_rtc_read_alarm, + .update_irq_enable = tps6586x_rtc_update_irq_enable, +}; + +static irqreturn_t tps6586x_rtc_irq(int irq, void *data) +{ + struct device *dev = data; + struct tps6586x_rtc *rtc = dev_get_drvdata(dev); + + rtc_update_irq(rtc->rtc, 1, RTC_IRQF | RTC_AF); + return IRQ_HANDLED; +} + +static int __devinit tps6586x_rtc_probe(struct platform_device *pdev) +{ + struct tps6586x_rtc_platform_data *pdata = pdev->dev.platform_data; + struct device *tps_dev = to_tps6586x_dev(&pdev->dev); + struct tps6586x_rtc *rtc; + int err; + + rtc = kzalloc(sizeof(*rtc), GFP_KERNEL); + + if (!rtc) + return -ENOMEM; + + rtc->irq = -1; + if (!pdata || (pdata->irq < 0)) + dev_warn(&pdev->dev, "no IRQ specified, wakeup is disabled\n"); + + rtc->epoch_start = mktime(TPS_EPOCH, 1, 1, 0, 0, 0); + + rtc->rtc = rtc_device_register("tps6586x-rtc", &pdev->dev, + &tps6586x_rtc_ops, THIS_MODULE); + + if (IS_ERR(rtc->rtc)) { + err = PTR_ERR(rtc->rtc); + goto fail; + } + + /* disable high-res mode, enable tick counting */ + err = tps6586x_update(tps_dev, RTC_CTRL, + (RTC_ENABLE | RTC_HIRES), RTC_ENABLE); + if (err < 0) { + dev_err(&pdev->dev, "unable to start counter\n"); + goto fail; + } + + dev_set_drvdata(&pdev->dev, rtc); + if (pdata && (pdata->irq >= 0)) { + rtc->irq = pdata->irq; + err = request_threaded_irq(pdata->irq, NULL, tps6586x_rtc_irq, + IRQF_ONESHOT, "tps6586x-rtc", + &pdev->dev); + if (err) { + dev_warn(&pdev->dev, "unable to request IRQ\n"); + rtc->irq = -1; + } else { + device_init_wakeup(&pdev->dev, 1); + disable_irq(rtc->irq); + enable_irq_wake(rtc->irq); + } + } + + return 0; + +fail: + if (!IS_ERR_OR_NULL(rtc->rtc)) + rtc_device_unregister(rtc->rtc); + kfree(rtc); + return err; +} + +static int __devexit tps6586x_rtc_remove(struct platform_device *pdev) +{ + struct tps6586x_rtc *rtc = dev_get_drvdata(&pdev->dev); + + if (rtc->irq != -1) + free_irq(rtc->irq, rtc); + rtc_device_unregister(rtc->rtc); + kfree(rtc); + return 0; +} + +static struct platform_driver tps6586x_rtc_driver = { + .driver = { + .name = "tps6586x-rtc", + .owner = THIS_MODULE, + }, + .probe = tps6586x_rtc_probe, + .remove = __devexit_p(tps6586x_rtc_remove), +}; + +static int __init tps6586x_rtc_init(void) +{ + return platform_driver_register(&tps6586x_rtc_driver); +} +module_init(tps6586x_rtc_init); + +static void __exit tps6586x_rtc_exit(void) +{ + platform_driver_unregister(&tps6586x_rtc_driver); +} +module_exit(tps6586x_rtc_exit); + +MODULE_DESCRIPTION("TI TPS6586x RTC driver"); +MODULE_AUTHOR("NVIDIA Corporation"); +MODULE_LICENSE("GPL"); diff --git a/include/linux/mfd/tps6586x.h b/include/linux/mfd/tps6586x.h index b6bab1b..d96fb3d 100644 --- a/include/linux/mfd/tps6586x.h +++ b/include/linux/mfd/tps6586x.h @@ -54,6 +54,10 @@ struct tps6586x_subdev_info { void *platform_data; }; +struct tps6586x_rtc_platform_data { + int irq; +}; + struct tps6586x_platform_data { int num_subdevs; struct tps6586x_subdev_info *subdevs;