From patchwork Tue Jan 25 04:53:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varun Wadekar X-Patchwork-Id: 80315 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-pv0-f184.google.com (mail-pv0-f184.google.com [74.125.83.184]) (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 AF51DB70F1 for ; Tue, 25 Jan 2011 15:53:24 +1100 (EST) Received: by mail-pv0-f184.google.com with SMTP id 11sf1673015pvg.11 for ; Mon, 24 Jan 2011 20:53:23 -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: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=c/BARSgSBdcKbP59nPIHN925fa9UXlKv0wZezvJ2Gf4=; b=0kKEZXoUqLpwPk7bzqGc1Pw8BITuPWSKGeUx8bRHRYAMCpBcJSDzT5fjnV45mq96GD JypPwfzhJzax7u1mav5URr4EfwNRHD0wS7j1tvm0gu36F5Vr8aZqyTJAU1iavfS6hTcc ihzW0bFToWOP3yHemQbQ4mzXYEfGh2r/Hi+nM= 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 :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=nmda3QxZ2+HJmyvzzF3t++IvwFhpy5cB1MlLYRJ10WlQiV7pgonK1KfQjsgEliN4Qn /Q8bJ9civQ5tyUJ6x+KGQSqP6QP4oYj3pz5Gfx8+C8/9p6wKU/aj+Xb/pj9JZkMXzv8z MhHdrBfJK2/aBzlTwk1StFFhgvnxvZMNivPOk= Received: by 10.142.164.14 with SMTP id m14mr270543wfe.11.1295931203064; Mon, 24 Jan 2011 20:53:23 -0800 (PST) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.142.249.41 with SMTP id w41ls139141wfh.1.p; Mon, 24 Jan 2011 20:53:22 -0800 (PST) Received: by 10.142.215.16 with SMTP id n16mr747458wfg.16.1295931202745; Mon, 24 Jan 2011 20:53:22 -0800 (PST) Received: by 10.142.215.16 with SMTP id n16mr747457wfg.16.1295931202716; Mon, 24 Jan 2011 20:53:22 -0800 (PST) Received: from hqemgate03.nvidia.com (hqemgate03.nvidia.com [216.228.121.140]) by gmr-mx.google.com with ESMTPS id p40si15177692wfc.6.2011.01.24.20.53.22 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 24 Jan 2011 20:53:22 -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 21:00:04 -0800 Received: from hqemhub01.nvidia.com ([172.17.108.22]) by hqnvupgp03.nvidia.com (PGP Universal service); Mon, 24 Jan 2011 20:53:22 -0800 X-PGP-Universal: processed; by hqnvupgp03.nvidia.com on Mon, 24 Jan 2011 20:53:22 -0800 Received: from [10.24.109.4] (172.20.144.16) by hqemhub01.nvidia.com (172.17.98.26) with Microsoft SMTP Server id 8.2.254.0; Mon, 24 Jan 2011 20:53:21 -0800 Message-ID: <4D3E573D.9060806@nvidia.com> Date: Tue, 25 Jan 2011 10:23:17 +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: CC: Alessandro Zummo , "linux-tegra@vger.kernel.org" , Andy Ritger , Stephen Warren , Bharat Nihalani , Varun Wadekar Subject: [rtc-linux] [PATCH 1/2] rtc: tps6586x: add alarm support to tps6586x driver 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: , This patch depends on patch 0: ---- rtc: tps6586x: add alarm support to tps6586x driver Signed-off-by: Gary King nvpublic diff --git a/drivers/rtc/rtc-tps6586x.c b/drivers/rtc/rtc-tps6586x.c index f898f40..9ab93cb 100644 --- a/drivers/rtc/rtc-tps6586x.c +++ b/drivers/rtc/rtc-tps6586x.c @@ -39,6 +39,8 @@ struct tps6586x_rtc { unsigned long epoch_start; + int irq; + bool irq_en; struct rtc_device *rtc; }; @@ -100,10 +102,6 @@ static int tps6586x_rtc_set_time(struct device *dev, struct rtc_time *tm) buff[3] = (ticks >> 8) & 0xff; buff[4] = ticks & 0xff; - dev_info(dev, "setting time to %lu seconds (%llu ticks)\n", - seconds, ticks); - - err = tps6586x_clr_bits(tps_dev, RTC_CTRL, RTC_ENABLE); if (err < 0) { dev_err(dev, "failed to clear RTC_ENABLE\n"); @@ -125,13 +123,115 @@ static int tps6586x_rtc_set_time(struct device *dev, struct rtc_time *tm) 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 = (seconds << 10) & 0xffffff; + + 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; @@ -141,7 +241,12 @@ static int __devinit tps6586x_rtc_probe(struct platform_device *pdev) 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); @@ -159,6 +264,21 @@ static int __devinit tps6586x_rtc_probe(struct platform_device *pdev) } 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: @@ -172,6 +292,8 @@ 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; 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;