From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCCB7C433E0 for ; Tue, 16 Jun 2020 13:11:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 89C3020FC3 for ; Tue, 16 Jun 2020 13:11:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VgKRy5xy" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726526AbgFPNLp (ORCPT ); Tue, 16 Jun 2020 09:11:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726052AbgFPNLo (ORCPT ); Tue, 16 Jun 2020 09:11:44 -0400 Received: from mail-qv1-xf43.google.com (mail-qv1-xf43.google.com [IPv6:2607:f8b0:4864:20::f43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64602C061573 for ; Tue, 16 Jun 2020 06:11:44 -0700 (PDT) Received: by mail-qv1-xf43.google.com with SMTP id cv17so9390680qvb.13 for ; Tue, 16 Jun 2020 06:11:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=content-transfer-encoding:in-reply-to:date:cc:subject:from:to :message-id; bh=G6U29bpdiVyvK6Hyf1AEqYkM9+/hzp2JxQMukO93UWg=; b=VgKRy5xyTxNrQa9tlck1RRqflKqCnOXYZTw6pHrgD9reuEQqMjS9mj2C0ldkHoFLid VtaYkcWQezLFE1sUq+4g3i/W/ZPyLiNZrd1wvRCy33qKOoIiT7V/PYMye9+7zlI6CqJp SGQOO/JTbFyBFoAE0y7jMcsYkdLt1alaUuFQNfqIypvJw5SxKRrf/tYhIrhXqKKQ0SqZ l+eWxmQbgi87BsC9gjRFSUEvQGiB35hclQebJKIjGdI72NDJdgu+kbPConhFQNrKEO8K tv2PFvlFJTnzGnODhx/QayM4oVFkGcVJrohXdk7Js22DdOSJy416BgFLqQJirV/KRp0Z +eig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:content-transfer-encoding:in-reply-to:date:cc :subject:from:to:message-id; bh=G6U29bpdiVyvK6Hyf1AEqYkM9+/hzp2JxQMukO93UWg=; b=QXOdMTiLWSu1CnWuAnve9/BMmbLchfn7ni5cgHmx8bK/VboS/Gd9Tk+hYHSJn1jjSZ vUCVevZA4etFLOvO8X0ABDMdR47OQsTHKffAAmCIS3+NKHKYB2yZpDQTPX8mJEVZcCrX pKkXrYVc5OQoiF0yNdJ4iD5luYxDSp+DaO0JrvhwJ/zwa3c3KtcqWuRGNDzMVfnV+2g9 P7SdG2Sce4v8AVBK9grBkoTjsXlOrb0zfj+WGrgaO0Bb08NRV6JJ+nzcB9WjsTUfVAgP QDhMNvIOGkkqXHF30e9dQvYJMxRD9O1y8ninMqzWFG5YPVPtzPKQWV0RM7c/WB2qkx7u mf0A== X-Gm-Message-State: AOAM533cPHgv96EZ2CMWKN/W6T5panmyFqY8ZH6xk3QoZ6T5Ra7VxIn2 NZZcMgJbT6Da6n1LzwG3sKwd9C+u X-Google-Smtp-Source: ABdhPJwhLMOJR+cGLal1KY8zw0e4H+HR55B0l2dhl3G+ShSGoK63oLHrnmPb3eK89nU1jryBSoL9wA== X-Received: by 2002:a05:6214:713:: with SMTP id b19mr2140049qvz.199.1592313103387; Tue, 16 Jun 2020 06:11:43 -0700 (PDT) Received: from localhost (198-48-202-89.cpe.pppoe.ca. [198.48.202.89]) by smtp.gmail.com with ESMTPSA id p6sm15417743qtd.91.2020.06.16.06.11.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jun 2020 06:11:42 -0700 (PDT) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 In-Reply-To: Date: Tue, 16 Jun 2020 09:11:41 -0400 Cc: "Alessandro Zummo" , "Alexandre Belloni" , Subject: Re: [PATCH v2 2/2] rtc: pcf2127: add alarm support From: "Liam Beguin" To: "Bruno Thomsen" Message-Id: Sender: linux-rtc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org Hi Bruno, On Tue Jun 16, 2020 at 10:38 AM Bruno Thomsen wrote: > Hi Liam >=20 > Good updates, but you need to rebase patches on top of the latest mainlin= e tree. Thanks, I'll rebase before sending v3. >=20 > Den s=C3=B8n. 14. jun. 2020 kl. 06.04 skrev Liam Beguin : > > > > From: Liam Beguin > > > > Add alarm support for the pcf2127 RTC chip family. > > Tested on pca2129. > > > > Signed-off-by: Liam Beguin > > --- > > Changes since v1: > > - Add calls to pcf2127_wdt_active_ping after accessing CTRL2 > > - Cleanup calls to regmap_{read,write,update_bits} > > - Cleanup debug trace > > - Add interrupt handler, untested because of hardware limitations > > - Add wakeup-source devicetree option > > > > drivers/rtc/rtc-pcf2127.c | 169 +++++++++++++++++++++++++++++++++++++- > > 1 file changed, 166 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/rtc/rtc-pcf2127.c b/drivers/rtc/rtc-pcf2127.c > > index 396a1144a213..87ecb29247c6 100644 > > --- a/drivers/rtc/rtc-pcf2127.c > > +++ b/drivers/rtc/rtc-pcf2127.c > > @@ -20,6 +20,7 @@ > > #include > > #include > > #include > > +#include > > #include > > #include > > > > @@ -28,7 +29,9 @@ > > #define PCF2127_BIT_CTRL1_TSF1 BIT(4) > > /* Control register 2 */ > > #define PCF2127_REG_CTRL2 0x01 > > +#define PCF2127_BIT_CTRL2_AIE BIT(1) > > #define PCF2127_BIT_CTRL2_TSIE BIT(2) > > +#define PCF2127_BIT_CTRL2_AF BIT(4) > > #define PCF2127_BIT_CTRL2_TSF2 BIT(5) > > /* Control register 3 */ > > #define PCF2127_REG_CTRL3 0x02 > > @@ -46,6 +49,12 @@ > > #define PCF2127_REG_DW 0x07 > > #define PCF2127_REG_MO 0x08 > > #define PCF2127_REG_YR 0x09 > > +/* Alarm registers */ > > +#define PCF2127_REG_ALARM_SC 0x0A > > +#define PCF2127_REG_ALARM_MN 0x0B > > +#define PCF2127_REG_ALARM_HR 0x0C > > +#define PCF2127_REG_ALARM_DM 0x0D > > +#define PCF2127_REG_ALARM_DW 0x0E > > /* Watchdog registers */ > > #define PCF2127_REG_WD_CTL 0x10 > > #define PCF2127_BIT_WD_CTL_TF0 BIT(0) > > @@ -79,6 +88,8 @@ > > #define PCF2127_WD_VAL_MAX 255 > > #define PCF2127_WD_VAL_DEFAULT 60 > > > > +static int pcf2127_wdt_active_ping(struct watchdog_device *wdd); > > + > > struct pcf2127 { > > struct rtc_device *rtc; > > struct watchdog_device wdd; > > @@ -185,6 +196,140 @@ static int pcf2127_rtc_set_time(struct device *de= v, struct rtc_time *tm) > > return 0; > > } > > > > +static int pcf2127_rtc_read_alarm(struct device *dev, struct rtc_wkalr= m *alrm) > > +{ > > + struct pcf2127 *pcf2127 =3D dev_get_drvdata(dev); > > + unsigned int buf[5], ctrl2; > > + int ret; > > + > > + ret =3D regmap_read(pcf2127->regmap, PCF2127_REG_CTRL2, &ctrl2)= ; > > + if (ret) { > > + dev_err(dev, "%s: ctrl2 read error\n", __func__); > > + return ret; > > + } > > + > > + ret =3D pcf2127_wdt_active_ping(&pcf2127->wdd); > > + if (ret) > > + return ret; > > + > > + ret =3D regmap_bulk_read(pcf2127->regmap, PCF2127_REG_ALARM_SC,= buf, > > + sizeof(buf)); > > + if (ret) { > > + dev_err(dev, "%s: alarm read error\n", __func__); > > + return ret; > > + } > > + > > + alrm->enabled =3D ctrl2 & PCF2127_BIT_CTRL2_AIE; > > + alrm->pending =3D ctrl2 & PCF2127_BIT_CTRL2_AF; > > + > > + alrm->time.tm_sec =3D bcd2bin(buf[0] & 0x7F); > > + alrm->time.tm_min =3D bcd2bin(buf[1] & 0x7F); > > + alrm->time.tm_hour =3D bcd2bin(buf[2] & 0x3F); > > + alrm->time.tm_mday =3D bcd2bin(buf[3] & 0x3F); > > + alrm->time.tm_wday =3D buf[4] & 0x07; > > + > > + dev_dbg(dev, "%s: alarm is %d:%d:%d, mday=3D%d, wday=3D%d\n", _= _func__, > > + alrm->time.tm_hour, alrm->time.tm_min, alrm->time.tm_se= c, > > + alrm->time.tm_mday, alrm->time.tm_wday); > > + > > + return 0; > > +} > > + > > +static int pcf2127_rtc_alarm_irq_enable(struct device *dev, u32 enable= ) > > +{ > > + struct pcf2127 *pcf2127 =3D dev_get_drvdata(dev); > > + int ret; > > + > > + ret =3D regmap_update_bits(pcf2127->regmap, PCF2127_REG_CTRL2, > > + PCF2127_BIT_CTRL2_AIE, > > + enable ? PCF2127_BIT_CTRL2_AIE : 0); > > + if (ret) { > > + dev_err(dev, "%s: failed to %s alarm (%d)\n", __func__, > > + enable ? "enable" : "disable", > > + ret); > > + return ret; > > + } > > + > > + ret =3D pcf2127_wdt_active_ping(&pcf2127->wdd); > > + if (ret) > > + return ret; > > + > > + return 0; >=20 > Just do "return ret;" unconditional. >=20 > > +} > > + > > +static int pcf2127_rtc_set_alarm(struct device *dev, struct rtc_wkalrm= *alrm) > > +{ > > + struct pcf2127 *pcf2127 =3D dev_get_drvdata(dev); > > + uint8_t buf[5]; > > + int ret; > > + > > + ret =3D regmap_update_bits(pcf2127->regmap, PCF2127_REG_CTRL2, > > + PCF2127_BIT_CTRL2_AF, 0); > > + if (ret) { > > + dev_err(dev, "%s: failed to clear alarm interrupt flag = (%d)", > > + __func__, ret); > > + return ret; > > + } > > + > > + ret =3D pcf2127_wdt_active_ping(&pcf2127->wdd); > > + if (ret) > > + return ret; > > + > > + buf[0] =3D bin2bcd(alrm->time.tm_sec); > > + buf[1] =3D bin2bcd(alrm->time.tm_min); > > + buf[2] =3D bin2bcd(alrm->time.tm_hour); > > + buf[3] =3D bin2bcd(alrm->time.tm_mday); > > + buf[4] =3D (alrm->time.tm_wday & 0x07); > > + > > + dev_dbg(dev, "%s: alarm set for: %d:%d:%d, mday=3D%d, wday=3D%d= \n", > > + __func__, alrm->time.tm_hour, alrm->time.tm_min, > > + alrm->time.tm_sec, alrm->time.tm_mday, alrm->time.tm_wd= ay); > > + > > + ret =3D regmap_bulk_write(pcf2127->regmap, PCF2127_REG_ALARM_SC= , buf, > > + sizeof(buf)); > > + if (ret) { > > + dev_err(dev, "%s: failed to write alarm registers (%d)"= , > > + __func__, ret); > > + return ret; > > + } > > + > > + pcf2127_rtc_alarm_irq_enable(dev, alrm->enabled); > > + > > + return 0; > > +} > > + > > +static irqreturn_t pcf2127_rtc_irq(int irq, void *dev) > > +{ > > + struct pcf2127 *pcf2127 =3D dev_get_drvdata(dev); > > + unsigned int ctrl2 =3D 0; > > + int ret =3D 0; > > + > > + ret =3D regmap_read(pcf2127->regmap, PCF2127_REG_CTRL2, &ctrl2)= ; > > + if (ret) { > > + dev_err(dev, "%s: ctrl2 read error (%d)\n", __func__, r= et); > > + goto irq_err; > > + } > > + > > + ret =3D pcf2127_wdt_active_ping(&pcf2127->wdd); > > + if (ret) > > + goto irq_err; > > + > > + if (ctrl2 & PCF2127_BIT_CTRL2_AF) { > > + regmap_update_bits(pcf2127->regmap, PCF2127_REG_CTRL2, > > + PCF2127_BIT_CTRL2_AF, 0); > > + > > + ret =3D pcf2127_wdt_active_ping(&pcf2127->wdd); > > + if (ret) > > + goto irq_err; > > + > > + rtc_update_irq(pcf2127->rtc, 1, RTC_IRQF | RTC_AF); > > + } >=20 > Do pcf2127_wdt_active_ping() here to avoid having the same code twice > in the function. That looks better, I'll update. Thanks, Liam >=20 > /Bruno >=20 > > + > > + return IRQ_HANDLED; > > +irq_err: > > + return IRQ_NONE; > > +} > > + > > #ifdef CONFIG_RTC_INTF_DEV > > static int pcf2127_rtc_ioctl(struct device *dev, > > unsigned int cmd, unsigned long arg) > > @@ -211,9 +356,12 @@ static int pcf2127_rtc_ioctl(struct device *dev, > > #endif > > > > static const struct rtc_class_ops pcf2127_rtc_ops =3D { > > - .ioctl =3D pcf2127_rtc_ioctl, > > - .read_time =3D pcf2127_rtc_read_time, > > - .set_time =3D pcf2127_rtc_set_time, > > + .ioctl =3D pcf2127_rtc_ioctl, > > + .read_time =3D pcf2127_rtc_read_time, > > + .set_time =3D pcf2127_rtc_set_time, > > + .read_alarm =3D pcf2127_rtc_read_alarm, > > + .set_alarm =3D pcf2127_rtc_set_alarm, > > + .alarm_irq_enable =3D pcf2127_rtc_alarm_irq_enable, > > }; > > > > static int pcf2127_nvmem_read(void *priv, unsigned int offset, > > @@ -415,6 +563,7 @@ static int pcf2127_probe(struct device *dev, struct= regmap *regmap, > > const char *name, bool has_nvmem) > > { > > struct pcf2127 *pcf2127; > > + int alarm_irq =3D 0; > > u32 wdd_timeout; > > int ret =3D 0; > > > > @@ -434,6 +583,20 @@ static int pcf2127_probe(struct device *dev, struc= t regmap *regmap, > > > > pcf2127->rtc->ops =3D &pcf2127_rtc_ops; > > > > + alarm_irq =3D of_irq_get_byname(dev->of_node, "alarm"); > > + if (alarm_irq >=3D 0) { > > + ret =3D devm_request_irq(dev, alarm_irq, pcf2127_rtc_ir= q, > > + IRQF_TRIGGER_LOW | IRQF_ONESHOT, > > + dev_name(dev), dev); > > + if (ret) { > > + dev_err(dev, "failed to request alarm irq\n"); > > + return ret; > > + } > > + } > > + > > + if (alarm_irq >=3D 0 || device_property_read_bool(dev, "wakeup-= source")) > > + device_init_wakeup(dev, true); > > + > > pcf2127->wdd.parent =3D dev; > > pcf2127->wdd.info =3D &pcf2127_wdt_info; > > pcf2127->wdd.ops =3D &pcf2127_watchdog_ops; > > -- > > 2.27.0 > >