From patchwork Wed Sep 26 18:42:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Langer X-Patchwork-Id: 187173 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-la0-f56.google.com (mail-la0-f56.google.com [209.85.215.56]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 70F512C0099 for ; Thu, 27 Sep 2012 04:43:00 +1000 (EST) Received: by lahi5 with SMTP id i5sf39712lah.11 for ; Wed, 26 Sep 2012 11:42:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=x-beenthere:received-spf:date:from:to:cc:subject:message-id :user-agent:mime-version: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=JVMbkMC2WJWJXRWMKeekquKGb/1oyptKercf740/e84=; b=AwsSXlX+EvSQJND1xcdlCZQPVRVFadJPiDa801kgdFWospy3MuMvEr4Y+tHjePJt22 Hb9Ro/lORz2X8SjV4gwVucmL1M7KY/sxp+ixz1QrABQKOHMckGLXtKN1a+Iil0SUNwJy HlnlEM/Gi+oU/k9f13lCtLIuMVCAMoJwW/R2+vczN+d4qMC8fCWLIydwqgsDBzhXUFyZ cPYbnKl3O37AJRjYmqU8JXNX112m6kyVnHZ5El0nmqhIAhtVBTxsbY4S0x7vMJRrmVwb DV6FX8vzI9tPoMBYf/TSJmGiGiEk5KrvEflboE5/ugCZpMZwwIpjRVCPDws6oMyjjqLy DCNg== Received: by 10.204.130.204 with SMTP id u12mr236161bks.1.1348684976735; Wed, 26 Sep 2012 11:42:56 -0700 (PDT) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.205.130.9 with SMTP id hk9ls1043852bkc.7.gmail; Wed, 26 Sep 2012 11:42:56 -0700 (PDT) Received: by 10.204.148.22 with SMTP id n22mr165519bkv.0.1348684976031; Wed, 26 Sep 2012 11:42:56 -0700 (PDT) Received: by 10.204.148.22 with SMTP id n22mr165518bkv.0.1348684976011; Wed, 26 Sep 2012 11:42:56 -0700 (PDT) Received: from mail-bk0-f54.google.com (mail-bk0-f54.google.com [209.85.214.54]) by gmr-mx.google.com with ESMTPS id v13si200008bkw.0.2012.09.26.11.42.55 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 26 Sep 2012 11:42:56 -0700 (PDT) Received-SPF: pass (google.com: domain of michael.brainbug.langer@googlemail.com designates 209.85.214.54 as permitted sender) client-ip=209.85.214.54; Received: by mail-bk0-f54.google.com with SMTP id je9so642929bkc.27 for ; Wed, 26 Sep 2012 11:42:55 -0700 (PDT) Received: by 10.204.6.75 with SMTP id 11mr1141417bky.10.1348684975743; Wed, 26 Sep 2012 11:42:55 -0700 (PDT) Received: from p5B267A10.dip.t-dialin.net (p5B267A10.dip.t-dialin.net. [91.38.122.16]) by mx.google.com with ESMTPS id x13sm3069063bkv.16.2012.09.26.11.42.54 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 26 Sep 2012 11:42:55 -0700 (PDT) Date: Wed, 26 Sep 2012 20:42:54 +0200 (CEST) From: Michael Langer To: Alessandro Zummo cc: rtc-linux@googlegroups.com, linux-kernel@vger.kernel.org, akpm@linux-foundation.org Subject: [rtc-linux] Re: [PATCH] rtc: add wakealarm support for rtc-s35390A rtc chip Message-ID: User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-Original-Sender: michael.brainbug.langer@googlemail.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of michael.brainbug.langer@googlemail.com designates 209.85.214.54 as permitted sender) smtp.mail=michael.brainbug.langer@googlemail.com; dkim=pass header.i=@googlemail.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: , On Tue, 25 Sep 2012, Andrew Morton wrote: > The patch is wordwrapped and has its tabs replaced with spaces. Please > fix these things, resend and cc myself? > Resend patch with alpine. Hopefully without wordwrap and spaces. Sorry for the inconvenience. >From a01affe35c049f66fc83ee151d760f3c943aa327 Mon Sep 17 00:00:00 2001 From: Michael Langer Date: Sun, 23 Sep 2012 08:27:24 +0200 Subject: [PATCH] rtc: add wakealarm support for rtc-s35390A rtc chip This adds basic get/set alarm support for the Seiko Instruments S-35390A. The chip is used on the QNAP TS-219P+ NAS device. Signed-off-by: Michael Langer --- drivers/rtc/rtc-s35390a.c | 116 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/drivers/rtc/rtc-s35390a.c b/drivers/rtc/rtc-s35390a.c index c9562ce..ef41e7e 100644 --- a/drivers/rtc/rtc-s35390a.c +++ b/drivers/rtc/rtc-s35390a.c @@ -19,6 +19,8 @@ #define S35390A_CMD_STATUS1 0 #define S35390A_CMD_STATUS2 1 #define S35390A_CMD_TIME1 2 +#define S35390A_CMD_TIME2 3 +#define S35390A_CMD_INT2_REG1 5 #define S35390A_BYTE_YEAR 0 #define S35390A_BYTE_MONTH 1 @@ -28,12 +30,23 @@ #define S35390A_BYTE_MINS 5 #define S35390A_BYTE_SECS 6 +#define S35390A_ALRM_BYTE_WDAY 0 +#define S35390A_ALRM_BYTE_HOURS 1 +#define S35390A_ALRM_BYTE_MINS 2 + #define S35390A_FLAG_POC 0x01 #define S35390A_FLAG_BLD 0x02 #define S35390A_FLAG_24H 0x40 #define S35390A_FLAG_RESET 0x80 #define S35390A_FLAG_TEST 0x01 +#define S35390A_INT2_MODE_MASK 0xF0 + +#define S35390A_INT2_MODE_NOINTR 0x00 +#define S35390A_INT2_MODE_FREQ 0x10 +#define S35390A_INT2_MODE_ALARM 0x40 +#define S35390A_INT2_MODE_PMIN_EDG 0x20 + static const struct i2c_device_id s35390a_id[] = { { "s35390a", 0 }, { } @@ -184,6 +197,104 @@ static int s35390a_get_datetime(struct i2c_client *client, struct rtc_time *tm) return rtc_valid_tm(tm); } +static int s35390a_set_alarm(struct i2c_client *client, struct rtc_wkalrm *alm) +{ + struct s35390a *s35390a = i2c_get_clientdata(client); + char buf[3], sts = 0; + int err, i; + + dev_dbg(&client->dev, "%s: alm is secs=%d, mins=%d, hours=%d mday=%d, "\ + "mon=%d, year=%d, wday=%d\n", __func__, alm->time.tm_sec, + alm->time.tm_min, alm->time.tm_hour, alm->time.tm_mday, + alm->time.tm_mon, alm->time.tm_year, alm->time.tm_wday); + + /* disable interrupt */ + err = s35390a_set_reg(s35390a, S35390A_CMD_STATUS2, &sts, sizeof(sts)); + if (err < 0) + return err; + + /* clear pending interrupt, if any */ + err = s35390a_get_reg(s35390a, S35390A_CMD_STATUS1, &sts, sizeof(sts)); + if (err < 0) + return err; + + if (alm->enabled) + sts = S35390A_INT2_MODE_ALARM; + else + sts = S35390A_INT2_MODE_NOINTR; + + /* This chip expects the bits of each byte to be in reverse order */ + sts = bitrev8(sts); + + /* set interupt mode*/ + err = s35390a_set_reg(s35390a, S35390A_CMD_STATUS2, &sts, sizeof(sts)); + if (err < 0) + return err; + + if (alm->time.tm_wday != -1) + buf[S35390A_ALRM_BYTE_WDAY] = bin2bcd(alm->time.tm_wday) | 0x80; + + buf[S35390A_ALRM_BYTE_HOURS] = s35390a_hr2reg(s35390a, + alm->time.tm_hour) | 0x80; + buf[S35390A_ALRM_BYTE_MINS] = bin2bcd(alm->time.tm_min) | 0x80; + + if (alm->time.tm_hour >= 12) + buf[S35390A_ALRM_BYTE_HOURS] |= 0x40; + + for (i = 0; i < 3; ++i) + buf[i] = bitrev8(buf[i]); + + err = s35390a_set_reg(s35390a, S35390A_CMD_INT2_REG1, buf, + sizeof(buf)); + + return err; +} + +static int s35390a_read_alarm(struct i2c_client *client, struct rtc_wkalrm *alm) +{ + struct s35390a *s35390a = i2c_get_clientdata(client); + char buf[3], sts; + int i, err; + + err = s35390a_get_reg(s35390a, S35390A_CMD_STATUS2, &sts, sizeof(sts)); + if (err < 0) + return err; + + if (bitrev8(sts) != S35390A_INT2_MODE_ALARM) + return -EINVAL; + + err = s35390a_get_reg(s35390a, S35390A_CMD_INT2_REG1, buf, sizeof(buf)); + if (err < 0) + return err; + + /* This chip returns the bits of each byte in reverse order */ + for (i = 0; i < 3; ++i) { + buf[i] = bitrev8(buf[i]); + buf[i] &= ~0x80; + } + + alm->time.tm_wday = bcd2bin(buf[S35390A_ALRM_BYTE_WDAY]); + alm->time.tm_hour = s35390a_reg2hr(s35390a, + buf[S35390A_ALRM_BYTE_HOURS]); + alm->time.tm_min = bcd2bin(buf[S35390A_ALRM_BYTE_MINS]); + + dev_dbg(&client->dev, "%s: alm is mins=%d, hours=%d, wday=%d\n", + __func__, alm->time.tm_min, alm->time.tm_hour, + alm->time.tm_wday); + + return 0; +} + +static int s35390a_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alm) +{ + return s35390a_read_alarm(to_i2c_client(dev), alm); +} + +static int s35390a_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm) +{ + return s35390a_set_alarm(to_i2c_client(dev), alm); +} + static int s35390a_rtc_read_time(struct device *dev, struct rtc_time *tm) { return s35390a_get_datetime(to_i2c_client(dev), tm); @@ -197,6 +308,9 @@ static int s35390a_rtc_set_time(struct device *dev, struct rtc_time *tm) static const struct rtc_class_ops s35390a_rtc_ops = { .read_time = s35390a_rtc_read_time, .set_time = s35390a_rtc_set_time, + .set_alarm = s35390a_rtc_set_alarm, + .read_alarm = s35390a_rtc_read_alarm, + }; static struct i2c_driver s35390a_driver; @@ -261,6 +375,8 @@ static int s35390a_probe(struct i2c_client *client, if (s35390a_get_datetime(client, &tm) < 0) dev_warn(&client->dev, "clock needs to be set\n"); + device_set_wakeup_capable(&client->dev, 1); + s35390a->rtc = rtc_device_register(s35390a_driver.driver.name, &client->dev, &s35390a_rtc_ops, THIS_MODULE);