From patchwork Mon Mar 21 05:42:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Ni X-Patchwork-Id: 87687 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-yi0-f56.google.com (mail-yi0-f56.google.com [209.85.218.56]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 150BBB6F7A for ; Mon, 21 Mar 2011 16:46:11 +1100 (EST) Received: by yib17 with SMTP id 17sf5326991yib.11 for ; Sun, 20 Mar 2011 22:46:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=beta; h=domainkey-signature:mime-version:x-beenthere:received-spf :x-pgp-universal:from:to:cc:subject:date:message-id:x-mailer :x-original-sender:x-original-authentication-results:reply-to :precedence:mailing-list:list-id:x-google-group-id:list-post :list-help:list-archive:sender:list-subscribe:list-unsubscribe :content-type; bh=BMHjZQAdj2qhBrInfqRzBPK33BIpP3vQmyE4es8O8Dk=; b=GnfALKkIRgzLg6vrM8nSi+79Nkgbxtkr71W6BjacYkDOlYYwQaROOYL4fUEdfzjiQ4 MBnM2U0SGeNOXuAzV9a3cNETZE9zjDOiskvCymOSgmBawNkJz2KpsJG5ffF5JbSOwtOJ rkhRMxORhl8zi0L6MIaCrLWCl91nPrpEYHPxY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlegroups.com; s=beta; h=mime-version:x-beenthere:received-spf:x-pgp-universal:from:to:cc :subject:date:message-id:x-mailer:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:x-google-group-id:list-post:list-help:list-archive:sender :list-subscribe:list-unsubscribe:content-type; b=ja0wnWhd+FK52NWsFA7eUOfhOE62+ICg2yT2RXlCSAGjAK4tXAmsXyaAeS3eF6CGnM Z4A5jVv6E6vg59ahmd8ci7bYTv0TaR3bgpvPWa85rwWheeXVRW2qjFYfQ+oand6ah69z ERUu/3nZaH8ieyNoRrZA09d4BOeRhjkTmIbtM= Received: by 10.90.233.4 with SMTP id f4mr20142agh.31.1300686367622; Sun, 20 Mar 2011 22:46:07 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.100.239.3 with SMTP id m3ls562270anh.0.p; Sun, 20 Mar 2011 22:46:07 -0700 (PDT) Received: by 10.101.46.15 with SMTP id y15mr2311987anj.8.1300686367309; Sun, 20 Mar 2011 22:46:07 -0700 (PDT) Received: by 10.101.46.15 with SMTP id y15mr2311986anj.8.1300686367295; Sun, 20 Mar 2011 22:46:07 -0700 (PDT) Received: from hqemgate04.nvidia.com (hqemgate04.nvidia.com [216.228.121.35]) by gmr-mx.google.com with ESMTPS id d8si1111499ana.7.2011.03.20.22.46.06 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 20 Mar 2011 22:46:06 -0700 (PDT) Received-SPF: pass (google.com: domain of wni@nvidia.com designates 216.228.121.35 as permitted sender) client-ip=216.228.121.35; Received: from hqnvupgp08.nvidia.com (Not Verified[216.228.121.13]) by hqemgate04.nvidia.com id ; Sun, 20 Mar 2011 22:43:59 -0700 Received: from hqnvemgw02.nvidia.com ([172.17.108.22]) by hqnvupgp08.nvidia.com (PGP Universal service); Sun, 20 Mar 2011 22:46:03 -0700 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Sun, 20 Mar 2011 22:46:03 -0700 Received: from daphne.nvidia.com (Not Verified[172.16.212.96]) by hqnvemgw02.nvidia.com with MailMarshal (v6, 7, 2, 8378) id ; Sun, 20 Mar 2011 22:46:15 -0700 Received: from localhost.localdomain ([10.19.174.255]) by daphne.nvidia.com (8.13.8+Sun/8.8.8) with ESMTP id p2L5jvDh029741; Sun, 20 Mar 2011 22:46:01 -0700 (PDT) From: wni@nvidia.com To: a.zummo@towertech.it, rtc-linux@googlegroups.com Cc: linux-tegra@vger.kernel.org, Wei Ni Subject: [rtc-linux] [PATCH v8] mfd: tps6586x: add RTC driver for TI TPS6586x Date: Mon, 21 Mar 2011 13:42:41 +0800 Message-Id: <1300686161-24712-1-git-send-email-wni@nvidia.com> X-Mailer: git-send-email 1.7.0 X-Original-Sender: wni@nvidia.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of wni@nvidia.com designates 216.228.121.35 as permitted sender) smtp.mail=wni@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: X-Google-Group-Id: 712029733259 List-Post: , List-Help: , List-Archive: Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , From: Wei Ni this driver supports setting of alarms, and reading/setting of time Signed-off-by: Wei Ni --- v8: use OSC_SRC_SEL to select external crystal clock. set alrm->enabled and init the rtc->irq_en. Add suspend/resume callback. drivers/rtc/rtc-tps6586x.c | 34 ++++++++++++++++++++++++++++++---- 1 files changed, 30 insertions(+), 4 deletions(-) diff --git a/drivers/rtc/rtc-tps6586x.c b/drivers/rtc/rtc-tps6586x.c index a42b4bb..b891899 100644 --- a/drivers/rtc/rtc-tps6586x.c +++ b/drivers/rtc/rtc-tps6586x.c @@ -30,6 +30,7 @@ #include #define RTC_CTRL 0xc0 +#define OSC_SRC_SEL BIT(6) /* select internal or external clock */ #define RTC_ENABLE BIT(5) /* enables alarm */ #define RTC_HIRES BIT(4) /* 1Khz or 32Khz updates */ #define RTC_ALARM1_HI 0xc1 @@ -180,6 +181,7 @@ static int tps6586x_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) seconds += rtc->epoch_start; rtc_time_to_tm(seconds, &alrm->time); + alrm->enabled = rtc->irq_en; return 0; } @@ -286,7 +288,9 @@ static int __devinit tps6586x_rtc_probe(struct platform_device *pdev) /* disable high-res mode, enable tick counting */ err = tps6586x_update(tps_dev, RTC_CTRL, - (RTC_ENABLE | RTC_HIRES), RTC_ENABLE); + (RTC_ENABLE | OSC_SRC_SEL), + (RTC_ENABLE | OSC_SRC_SEL)); + if (err < 0) { dev_err(&pdev->dev, "unable to start counter\n"); goto fail; @@ -299,11 +303,12 @@ static int __devinit tps6586x_rtc_probe(struct platform_device *pdev) IRQF_ONESHOT, "tps6586x-rtc", &pdev->dev); if (err) { - dev_warn(&pdev->dev, "unable to request IRQ(%d)\n", rtc->irq); + dev_warn(&pdev->dev, "unable to request IRQ(%d)\n", + rtc->irq); rtc->irq = -1; } else { disable_irq(rtc->irq); - enable_irq_wake(rtc->irq); + rtc->irq_en = false; } } @@ -327,6 +332,25 @@ static int __devexit tps6586x_rtc_remove(struct platform_device *pdev) return 0; } +static int tps6586x_rtc_suspend(struct platform_device *pdev, + pm_message_t state) +{ + struct tps6586x_rtc *rtc = dev_get_drvdata(&pdev->dev); + + if (device_may_wakeup(pdev)) + enable_irq_wake(rtc->irq); + return 0; +} + +static int tps6586x_rtc_resume(struct platform_device *pdev) +{ + struct tps6586x_rtc *rtc = dev_get_drvdata(&pdev->dev); + + if (device_may_wakeup(pdev)) + disable_irq_wake(rtc->irq); + return 0; +} + static struct platform_driver tps6586x_rtc_driver = { .driver = { .name = "tps6586x-rtc", @@ -334,6 +358,8 @@ static struct platform_driver tps6586x_rtc_driver = { }, .probe = tps6586x_rtc_probe, .remove = __devexit_p(tps6586x_rtc_remove), + .suspend = tps6586x_rtc_suspend, + .resume = tps6586x_rtc_resume, }; static int __init tps6586x_rtc_init(void) @@ -351,4 +377,4 @@ module_exit(tps6586x_rtc_exit); MODULE_DESCRIPTION("TI TPS6586x RTC driver"); MODULE_AUTHOR("NVIDIA Corporation"); MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:rtc-tps6586x") +MODULE_ALIAS("platform:rtc-tps6586x");