Message ID | 20221215150214.1109074-9-hugo@hugovil.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp421916wrn; Thu, 15 Dec 2022 07:20:51 -0800 (PST) X-Google-Smtp-Source: AA0mqf4RCTxYeQTGtL6S4MiXzq97sJdm6BzBKoTtj6KYK4Apoqmd44tb5RhBU3eUrXkMwZBJ1dc0 X-Received: by 2002:a17:902:bb98:b0:186:a43b:ac with SMTP id m24-20020a170902bb9800b00186a43b00acmr27778319pls.35.1671117650788; Thu, 15 Dec 2022 07:20:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671117650; cv=none; d=google.com; s=arc-20160816; b=qACYlkMsqrydId9UgThAnZeRlnVEl/6iJbyqe44nGiDS0tx+p3Udgd69Ue+v1cLBFg OGW+8IV3jeEa70N7iBjUBCXWQKoeagYuVY83wch0PEsXlik4V4TRd+rH7llXHWd7tjHt nFb7o1fUhVOrJpj6CZp/kCOqnX5tywjNl2Szy9dHvP5tEpGv224Nr7sEQ2r/s+UFKHSb ZrMXMlGo+xdlfBRfS1hIVd46upAOpOkb+1doJ/0WbDHKhD2IFxZXkwDgRBmVWEFBriBy mHT1tB0VPCpzqZTqxh8QRQrHjR2bOIh+jGg0OhFVAbW5ykqwgs751sqrNsYok0oJPwve Ed0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:cc:to:from:dkim-signature; bh=93BpRoQca1NquGcy51NScGuvojh7/iuZ0TUbanDmc/E=; b=nFw8HTNGNAWMmT8i0DQ+4+lXRyrS3bk14pk8R3bRobpkRED+GLFdvYvG3VRJexpFZj tQCbpwUOn073Q3IxFu5h2OEQTtU/CpUaVmEnJlgsEreoIn6yTP/TzXABViAy5yB30hyS 2AhLHInq7bh+c9IokbQZHk02axjlaesYzoEOZDGF+3IBJ+rCJKzeLCMpHuqYGWCeJIzO 8LQapU4yfhue+OpdiVdEoY4RQEZ2V51qzzfCPxJrvRBGzUDhzH51mT8R9BUCQjzM0glA /uRMsbaBc5AsCF6mLOzTjIFwS9hkqzc5ODa4xhJWIb8CjmSt+udjAwJwkyamw7ulHDiE R+Yw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=YLMnlpqQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jj19-20020a170903049300b001868277386dsi5377046plb.192.2022.12.15.07.20.31; Thu, 15 Dec 2022 07:20:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@hugovil.com header.s=x header.b=YLMnlpqQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230171AbiLOPTE (ORCPT <rfc822;jeantsuru.cumc.mandola@gmail.com> + 99 others); Thu, 15 Dec 2022 10:19:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230059AbiLOPSV (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 15 Dec 2022 10:18:21 -0500 Received: from mail.hugovil.com (mail.hugovil.com [162.243.120.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D56AC70; Thu, 15 Dec 2022 07:18:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=hugovil.com ; s=x; h=Subject:Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=93BpRoQca1NquGcy51NScGuvojh7/iuZ0TUbanDmc/E=; b=YLMnlpqQYsCMooD65o0qavlFV0 Mr/Zc+DEXDLagiHezge4uw47CPPxCbCgvOG1Lmj1HQhnvvc2LB2ktR0ORuJ9yyOCDmUG+UFcpGgIb p1jQECwB9fjzsYg1LQuQONsqH1V1nwztOKDmWyr2lCbltoNAjz+TeZC7ZldTS1qnkISw=; Received: from modemcable168.174-80-70.mc.videotron.ca ([70.80.174.168]:48102 helo=pettiford.lan) by mail.hugovil.com with esmtpa (Exim 4.92) (envelope-from <hugo@hugovil.com>) id 1p5pmJ-0000EC-9e; Thu, 15 Dec 2022 10:04:07 -0500 From: Hugo Villeneuve <hugo@hugovil.com> To: a.zummo@towertech.it, alexandre.belloni@bootlin.com, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org Cc: linux-rtc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, hugo@hugovil.com, Hugo Villeneuve <hvilleneuve@dimonoff.com> Date: Thu, 15 Dec 2022 10:02:09 -0500 Message-Id: <20221215150214.1109074-9-hugo@hugovil.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221215150214.1109074-1-hugo@hugovil.com> References: <20221215150214.1109074-1-hugo@hugovil.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 70.80.174.168 X-SA-Exim-Mail-From: hugo@hugovil.com X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 Subject: [PATCH v3 08/14] rtc: pcf2127: add support for PCF2131 interrupts on output INT_A X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.hugovil.com) Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752293861517584209?= X-GMAIL-MSGID: =?utf-8?q?1752293861517584209?= |
Series |
rtc: pcf2127: add PCF2131 driver
|
|
Commit Message
Hugo Villeneuve
Dec. 15, 2022, 3:02 p.m. UTC
From: Hugo Villeneuve <hvilleneuve@dimonoff.com> The PCF2127 and PCF2129 have one output interrupt pin. The PCF2131 has two, named INT_A and INT_B. The hardware support that any interrupt source can be routed to either one or both of them. Force all interrupt sources to go to the INT A pin. Support to route any interrupt source to INT A/B pins is not supported by this driver at the moment. Signed-off-by: Hugo Villeneuve <hvilleneuve@dimonoff.com> --- drivers/rtc/rtc-pcf2127.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+)
Comments
Den tor. 15. dec. 2022 kl. 16.20 skrev Hugo Villeneuve <hugo@hugovil.com>: > > From: Hugo Villeneuve <hvilleneuve@dimonoff.com> > > The PCF2127 and PCF2129 have one output interrupt pin. The PCF2131 has > two, named INT_A and INT_B. The hardware support that any interrupt > source can be routed to either one or both of them. > > Force all interrupt sources to go to the INT A pin. > > Support to route any interrupt source to INT A/B pins is not supported > by this driver at the moment. > > Signed-off-by: Hugo Villeneuve <hvilleneuve@dimonoff.com> Reviewed-by: Bruno Thomsen <bruno.thomsen@gmail.com> > --- > drivers/rtc/rtc-pcf2127.c | 35 +++++++++++++++++++++++++++++++++++ > 1 file changed, 35 insertions(+) > > diff --git a/drivers/rtc/rtc-pcf2127.c b/drivers/rtc/rtc-pcf2127.c > index 4148e135f935..68af4d0438b8 100644 > --- a/drivers/rtc/rtc-pcf2127.c > +++ b/drivers/rtc/rtc-pcf2127.c > @@ -191,6 +191,7 @@ struct pcf21xx_config { > int max_register; > unsigned int has_nvmem:1; > unsigned int has_bit_wd_ctl_cd0:1; > + unsigned int has_int_a_b:1; /* PCF2131 supports two interrupt outputs. */ > u8 regs_td_base; /* Time/data base registers. */ > u8 regs_alarm_base; /* Alarm function base registers. */ > u8 reg_wd_ctl; /* Watchdog control register. */ > @@ -879,6 +880,7 @@ static struct pcf21xx_config pcf21xx_cfg[] = { > .max_register = 0x1d, > .has_nvmem = 1, > .has_bit_wd_ctl_cd0 = 1, > + .has_int_a_b = 0, > .regs_td_base = PCF2127_REG_TIME_DATE_BASE, > .regs_alarm_base = PCF2127_REG_ALARM_BASE, > .reg_wd_ctl = PCF2127_REG_WD_CTL, > @@ -902,6 +904,7 @@ static struct pcf21xx_config pcf21xx_cfg[] = { > .max_register = 0x19, > .has_nvmem = 0, > .has_bit_wd_ctl_cd0 = 0, > + .has_int_a_b = 0, > .regs_td_base = PCF2127_REG_TIME_DATE_BASE, > .regs_alarm_base = PCF2127_REG_ALARM_BASE, > .reg_wd_ctl = PCF2127_REG_WD_CTL, > @@ -925,6 +928,7 @@ static struct pcf21xx_config pcf21xx_cfg[] = { > .max_register = 0x36, > .has_nvmem = 0, > .has_bit_wd_ctl_cd0 = 0, > + .has_int_a_b = 1, > .regs_td_base = PCF2131_REG_TIME_DATE_BASE, > .regs_alarm_base = PCF2131_REG_ALARM_BASE, > .reg_wd_ctl = PCF2131_REG_WD_CTL, > @@ -1017,6 +1021,28 @@ static int pcf2127_enable_ts(struct device *dev, int ts_id) > return ret; > } > > +/* Route all interrupt sources to INT A pin. */ > +static int pcf2127_configure_interrupt_pins(struct device *dev) > +{ > + struct pcf2127 *pcf2127 = dev_get_drvdata(dev); > + int ret; > + > + /* Mask bits need to be cleared to enable corresponding > + * interrupt source. > + */ > + ret = regmap_write(pcf2127->regmap, > + PCF2131_REG_INT_A_MASK1, 0); > + if (ret) > + return ret; > + > + ret = regmap_write(pcf2127->regmap, > + PCF2131_REG_INT_A_MASK2, 0); > + if (ret) > + return ret; > + > + return ret; > +} > + > static int pcf2127_probe(struct device *dev, struct regmap *regmap, > int alarm_irq, const char *name, const struct pcf21xx_config *config) > { > @@ -1076,6 +1102,15 @@ static int pcf2127_probe(struct device *dev, struct regmap *regmap, > set_bit(RTC_FEATURE_ALARM, pcf2127->rtc->features); > } > > + if (pcf2127->cfg->has_int_a_b) { > + /* Configure int A/B pins, independently of alarm_irq. */ > + ret = pcf2127_configure_interrupt_pins(dev); > + if (ret) { > + dev_err(dev, "failed to configure interrupt pins\n"); > + return ret; > + } > + } > + > if (pcf2127->cfg->has_nvmem) { > struct nvmem_config nvmem_cfg = { > .priv = pcf2127, > -- > 2.30.2 >
On 15/12/2022 10:02:09-0500, Hugo Villeneuve wrote: > From: Hugo Villeneuve <hvilleneuve@dimonoff.com> > > The PCF2127 and PCF2129 have one output interrupt pin. The PCF2131 has > two, named INT_A and INT_B. The hardware support that any interrupt > source can be routed to either one or both of them. > > Force all interrupt sources to go to the INT A pin. > > Support to route any interrupt source to INT A/B pins is not supported > by this driver at the moment. > The main issue with this is that this will created a breaking change once someone needs support for INTB > Signed-off-by: Hugo Villeneuve <hvilleneuve@dimonoff.com> > --- > drivers/rtc/rtc-pcf2127.c | 35 +++++++++++++++++++++++++++++++++++ > 1 file changed, 35 insertions(+) > > diff --git a/drivers/rtc/rtc-pcf2127.c b/drivers/rtc/rtc-pcf2127.c > index 4148e135f935..68af4d0438b8 100644 > --- a/drivers/rtc/rtc-pcf2127.c > +++ b/drivers/rtc/rtc-pcf2127.c > @@ -191,6 +191,7 @@ struct pcf21xx_config { > int max_register; > unsigned int has_nvmem:1; > unsigned int has_bit_wd_ctl_cd0:1; > + unsigned int has_int_a_b:1; /* PCF2131 supports two interrupt outputs. */ > u8 regs_td_base; /* Time/data base registers. */ > u8 regs_alarm_base; /* Alarm function base registers. */ > u8 reg_wd_ctl; /* Watchdog control register. */ > @@ -879,6 +880,7 @@ static struct pcf21xx_config pcf21xx_cfg[] = { > .max_register = 0x1d, > .has_nvmem = 1, > .has_bit_wd_ctl_cd0 = 1, > + .has_int_a_b = 0, > .regs_td_base = PCF2127_REG_TIME_DATE_BASE, > .regs_alarm_base = PCF2127_REG_ALARM_BASE, > .reg_wd_ctl = PCF2127_REG_WD_CTL, > @@ -902,6 +904,7 @@ static struct pcf21xx_config pcf21xx_cfg[] = { > .max_register = 0x19, > .has_nvmem = 0, > .has_bit_wd_ctl_cd0 = 0, > + .has_int_a_b = 0, > .regs_td_base = PCF2127_REG_TIME_DATE_BASE, > .regs_alarm_base = PCF2127_REG_ALARM_BASE, > .reg_wd_ctl = PCF2127_REG_WD_CTL, > @@ -925,6 +928,7 @@ static struct pcf21xx_config pcf21xx_cfg[] = { > .max_register = 0x36, > .has_nvmem = 0, > .has_bit_wd_ctl_cd0 = 0, > + .has_int_a_b = 1, > .regs_td_base = PCF2131_REG_TIME_DATE_BASE, > .regs_alarm_base = PCF2131_REG_ALARM_BASE, > .reg_wd_ctl = PCF2131_REG_WD_CTL, > @@ -1017,6 +1021,28 @@ static int pcf2127_enable_ts(struct device *dev, int ts_id) > return ret; > } > > +/* Route all interrupt sources to INT A pin. */ > +static int pcf2127_configure_interrupt_pins(struct device *dev) > +{ > + struct pcf2127 *pcf2127 = dev_get_drvdata(dev); > + int ret; > + > + /* Mask bits need to be cleared to enable corresponding > + * interrupt source. > + */ > + ret = regmap_write(pcf2127->regmap, > + PCF2131_REG_INT_A_MASK1, 0); > + if (ret) > + return ret; > + > + ret = regmap_write(pcf2127->regmap, > + PCF2131_REG_INT_A_MASK2, 0); > + if (ret) > + return ret; > + > + return ret; > +} > + > static int pcf2127_probe(struct device *dev, struct regmap *regmap, > int alarm_irq, const char *name, const struct pcf21xx_config *config) > { > @@ -1076,6 +1102,15 @@ static int pcf2127_probe(struct device *dev, struct regmap *regmap, > set_bit(RTC_FEATURE_ALARM, pcf2127->rtc->features); > } > > + if (pcf2127->cfg->has_int_a_b) { > + /* Configure int A/B pins, independently of alarm_irq. */ > + ret = pcf2127_configure_interrupt_pins(dev); > + if (ret) { > + dev_err(dev, "failed to configure interrupt pins\n"); > + return ret; > + } > + } > + > if (pcf2127->cfg->has_nvmem) { > struct nvmem_config nvmem_cfg = { > .priv = pcf2127, > -- > 2.30.2 >
On Fri, 20 Jan 2023 17:56:39 +0100 Alexandre Belloni <alexandre.belloni@bootlin.com> wrote: > On 15/12/2022 10:02:09-0500, Hugo Villeneuve wrote: > > From: Hugo Villeneuve <hvilleneuve@dimonoff.com> > > > > The PCF2127 and PCF2129 have one output interrupt pin. The PCF2131 has > > two, named INT_A and INT_B. The hardware support that any interrupt > > source can be routed to either one or both of them. > > > > Force all interrupt sources to go to the INT A pin. > > > > Support to route any interrupt source to INT A/B pins is not supported > > by this driver at the moment. > > > > The main issue with this is that this will created a breaking change > once someone needs support for INTB We already had a discussion about this a while ago: https://lore.kernel.org/linux-rtc/7be3f9541eaed7e17e334267e49665f442b1b458.camel@dimonoff.com/ What exactly do you suggest? I personnaly don't have any need for INTB at the moment and I would prefer to avoid the great complexity of supporting any combination of routing interrupts to any A ou pins. > > Signed-off-by: Hugo Villeneuve <hvilleneuve@dimonoff.com> > > --- > > drivers/rtc/rtc-pcf2127.c | 35 +++++++++++++++++++++++++++++++++++ > > 1 file changed, 35 insertions(+) > > > > diff --git a/drivers/rtc/rtc-pcf2127.c b/drivers/rtc/rtc-pcf2127.c > > index 4148e135f935..68af4d0438b8 100644 > > --- a/drivers/rtc/rtc-pcf2127.c > > +++ b/drivers/rtc/rtc-pcf2127.c > > @@ -191,6 +191,7 @@ struct pcf21xx_config { > > int max_register; > > unsigned int has_nvmem:1; > > unsigned int has_bit_wd_ctl_cd0:1; > > + unsigned int has_int_a_b:1; /* PCF2131 supports two interrupt outputs. */ > > u8 regs_td_base; /* Time/data base registers. */ > > u8 regs_alarm_base; /* Alarm function base registers. */ > > u8 reg_wd_ctl; /* Watchdog control register. */ > > @@ -879,6 +880,7 @@ static struct pcf21xx_config pcf21xx_cfg[] = { > > .max_register = 0x1d, > > .has_nvmem = 1, > > .has_bit_wd_ctl_cd0 = 1, > > + .has_int_a_b = 0, > > .regs_td_base = PCF2127_REG_TIME_DATE_BASE, > > .regs_alarm_base = PCF2127_REG_ALARM_BASE, > > .reg_wd_ctl = PCF2127_REG_WD_CTL, > > @@ -902,6 +904,7 @@ static struct pcf21xx_config pcf21xx_cfg[] = { > > .max_register = 0x19, > > .has_nvmem = 0, > > .has_bit_wd_ctl_cd0 = 0, > > + .has_int_a_b = 0, > > .regs_td_base = PCF2127_REG_TIME_DATE_BASE, > > .regs_alarm_base = PCF2127_REG_ALARM_BASE, > > .reg_wd_ctl = PCF2127_REG_WD_CTL, > > @@ -925,6 +928,7 @@ static struct pcf21xx_config pcf21xx_cfg[] = { > > .max_register = 0x36, > > .has_nvmem = 0, > > .has_bit_wd_ctl_cd0 = 0, > > + .has_int_a_b = 1, > > .regs_td_base = PCF2131_REG_TIME_DATE_BASE, > > .regs_alarm_base = PCF2131_REG_ALARM_BASE, > > .reg_wd_ctl = PCF2131_REG_WD_CTL, > > @@ -1017,6 +1021,28 @@ static int pcf2127_enable_ts(struct device *dev, int ts_id) > > return ret; > > } > > > > +/* Route all interrupt sources to INT A pin. */ > > +static int pcf2127_configure_interrupt_pins(struct device *dev) > > +{ > > + struct pcf2127 *pcf2127 = dev_get_drvdata(dev); > > + int ret; > > + > > + /* Mask bits need to be cleared to enable corresponding > > + * interrupt source. > > + */ > > + ret = regmap_write(pcf2127->regmap, > > + PCF2131_REG_INT_A_MASK1, 0); > > + if (ret) > > + return ret; > > + > > + ret = regmap_write(pcf2127->regmap, > > + PCF2131_REG_INT_A_MASK2, 0); > > + if (ret) > > + return ret; > > + > > + return ret; > > +} > > + > > static int pcf2127_probe(struct device *dev, struct regmap *regmap, > > int alarm_irq, const char *name, const struct pcf21xx_config *config) > > { > > @@ -1076,6 +1102,15 @@ static int pcf2127_probe(struct device *dev, struct regmap *regmap, > > set_bit(RTC_FEATURE_ALARM, pcf2127->rtc->features); > > } > > > > + if (pcf2127->cfg->has_int_a_b) { > > + /* Configure int A/B pins, independently of alarm_irq. */ > > + ret = pcf2127_configure_interrupt_pins(dev); > > + if (ret) { > > + dev_err(dev, "failed to configure interrupt pins\n"); > > + return ret; > > + } > > + } > > + > > if (pcf2127->cfg->has_nvmem) { > > struct nvmem_config nvmem_cfg = { > > .priv = pcf2127, > > -- > > 2.30.2 > > > > -- > Alexandre Belloni, co-owner and COO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com >
On Mon, 23 Jan 2023 15:52:40 -0500 Hugo Villeneuve <hugo@hugovil.com> wrote: > On Fri, 20 Jan 2023 17:56:39 +0100 > Alexandre Belloni <alexandre.belloni@bootlin.com> wrote: > > > On 15/12/2022 10:02:09-0500, Hugo Villeneuve wrote: > > > From: Hugo Villeneuve <hvilleneuve@dimonoff.com> > > > > > > The PCF2127 and PCF2129 have one output interrupt pin. The PCF2131 has > > > two, named INT_A and INT_B. The hardware support that any interrupt > > > source can be routed to either one or both of them. > > > > > > Force all interrupt sources to go to the INT A pin. > > > > > > Support to route any interrupt source to INT A/B pins is not supported > > > by this driver at the moment. > > > > > > > The main issue with this is that this will created a breaking change > > once someone needs support for INTB > > We already had a discussion about this a while ago: > > https://lore.kernel.org/linux-rtc/7be3f9541eaed7e17e334267e49665f442b1b458.camel@dimonoff.com/ > > What exactly do you suggest? I personnaly don't have any need for INTB at the moment and I would prefer to avoid the great complexity of supporting any combination of routing interrupts to any A ou pins. Hi Alexandre, a few months later, and I am still waiting for your feedback on this (and other questions/interrogations I raised for other patches related to this series) to submit the next version of this patch series. Can you have a look at it and provide some answers? Thank you, Hugo. > > > Signed-off-by: Hugo Villeneuve <hvilleneuve@dimonoff.com> > > > --- > > > drivers/rtc/rtc-pcf2127.c | 35 +++++++++++++++++++++++++++++++++++ > > > 1 file changed, 35 insertions(+) > > > > > > diff --git a/drivers/rtc/rtc-pcf2127.c b/drivers/rtc/rtc-pcf2127.c > > > index 4148e135f935..68af4d0438b8 100644 > > > --- a/drivers/rtc/rtc-pcf2127.c > > > +++ b/drivers/rtc/rtc-pcf2127.c > > > @@ -191,6 +191,7 @@ struct pcf21xx_config { > > > int max_register; > > > unsigned int has_nvmem:1; > > > unsigned int has_bit_wd_ctl_cd0:1; > > > + unsigned int has_int_a_b:1; /* PCF2131 supports two interrupt outputs. */ > > > u8 regs_td_base; /* Time/data base registers. */ > > > u8 regs_alarm_base; /* Alarm function base registers. */ > > > u8 reg_wd_ctl; /* Watchdog control register. */ > > > @@ -879,6 +880,7 @@ static struct pcf21xx_config pcf21xx_cfg[] = { > > > .max_register = 0x1d, > > > .has_nvmem = 1, > > > .has_bit_wd_ctl_cd0 = 1, > > > + .has_int_a_b = 0, > > > .regs_td_base = PCF2127_REG_TIME_DATE_BASE, > > > .regs_alarm_base = PCF2127_REG_ALARM_BASE, > > > .reg_wd_ctl = PCF2127_REG_WD_CTL, > > > @@ -902,6 +904,7 @@ static struct pcf21xx_config pcf21xx_cfg[] = { > > > .max_register = 0x19, > > > .has_nvmem = 0, > > > .has_bit_wd_ctl_cd0 = 0, > > > + .has_int_a_b = 0, > > > .regs_td_base = PCF2127_REG_TIME_DATE_BASE, > > > .regs_alarm_base = PCF2127_REG_ALARM_BASE, > > > .reg_wd_ctl = PCF2127_REG_WD_CTL, > > > @@ -925,6 +928,7 @@ static struct pcf21xx_config pcf21xx_cfg[] = { > > > .max_register = 0x36, > > > .has_nvmem = 0, > > > .has_bit_wd_ctl_cd0 = 0, > > > + .has_int_a_b = 1, > > > .regs_td_base = PCF2131_REG_TIME_DATE_BASE, > > > .regs_alarm_base = PCF2131_REG_ALARM_BASE, > > > .reg_wd_ctl = PCF2131_REG_WD_CTL, > > > @@ -1017,6 +1021,28 @@ static int pcf2127_enable_ts(struct device *dev, int ts_id) > > > return ret; > > > } > > > > > > +/* Route all interrupt sources to INT A pin. */ > > > +static int pcf2127_configure_interrupt_pins(struct device *dev) > > > +{ > > > + struct pcf2127 *pcf2127 = dev_get_drvdata(dev); > > > + int ret; > > > + > > > + /* Mask bits need to be cleared to enable corresponding > > > + * interrupt source. > > > + */ > > > + ret = regmap_write(pcf2127->regmap, > > > + PCF2131_REG_INT_A_MASK1, 0); > > > + if (ret) > > > + return ret; > > > + > > > + ret = regmap_write(pcf2127->regmap, > > > + PCF2131_REG_INT_A_MASK2, 0); > > > + if (ret) > > > + return ret; > > > + > > > + return ret; > > > +} > > > + > > > static int pcf2127_probe(struct device *dev, struct regmap *regmap, > > > int alarm_irq, const char *name, const struct pcf21xx_config *config) > > > { > > > @@ -1076,6 +1102,15 @@ static int pcf2127_probe(struct device *dev, struct regmap *regmap, > > > set_bit(RTC_FEATURE_ALARM, pcf2127->rtc->features); > > > } > > > > > > + if (pcf2127->cfg->has_int_a_b) { > > > + /* Configure int A/B pins, independently of alarm_irq. */ > > > + ret = pcf2127_configure_interrupt_pins(dev); > > > + if (ret) { > > > + dev_err(dev, "failed to configure interrupt pins\n"); > > > + return ret; > > > + } > > > + } > > > + > > > if (pcf2127->cfg->has_nvmem) { > > > struct nvmem_config nvmem_cfg = { > > > .priv = pcf2127, > > > -- > > > 2.30.2 > > > > > > > -- > > Alexandre Belloni, co-owner and COO, Bootlin > > Embedded Linux and Kernel engineering > > https://bootlin.com > > > > > -- > Hugo Villeneuve <hugo@hugovil.com>
On 11/05/2023 13:19:58-0400, Hugo Villeneuve wrote: > On Mon, 23 Jan 2023 15:52:40 -0500 > Hugo Villeneuve <hugo@hugovil.com> wrote: > > > On Fri, 20 Jan 2023 17:56:39 +0100 > > Alexandre Belloni <alexandre.belloni@bootlin.com> wrote: > > > > > On 15/12/2022 10:02:09-0500, Hugo Villeneuve wrote: > > > > From: Hugo Villeneuve <hvilleneuve@dimonoff.com> > > > > > > > > The PCF2127 and PCF2129 have one output interrupt pin. The PCF2131 has > > > > two, named INT_A and INT_B. The hardware support that any interrupt > > > > source can be routed to either one or both of them. > > > > > > > > Force all interrupt sources to go to the INT A pin. > > > > > > > > Support to route any interrupt source to INT A/B pins is not supported > > > > by this driver at the moment. > > > > > > > > > > The main issue with this is that this will created a breaking change > > > once someone needs support for INTB > > > > We already had a discussion about this a while ago: > > > > https://lore.kernel.org/linux-rtc/7be3f9541eaed7e17e334267e49665f442b1b458.camel@dimonoff.com/ > > > > What exactly do you suggest? I personnaly don't have any need for INTB at the moment and I would prefer to avoid the great complexity of supporting any combination of routing interrupts to any A ou pins. > > Hi Alexandre, > a few months later, and I am still waiting for your feedback on this (and other questions/interrogations I raised for other patches related to this series) to submit the next version of this patch series. > > Can you have a look at it and provide some answers? > I'm very very sorry this takes so long. For this one, I don't have a precise idea. I guess we could have one property per pin with a mask of the interrupts we are interested in. That would cover all the use cases. For example, a PMIC could take the alarms on INTB and the CPU could have alarms, battery low and UIE on INTA. > Thank you, > Hugo. > > > > > > Signed-off-by: Hugo Villeneuve <hvilleneuve@dimonoff.com> > > > > --- > > > > drivers/rtc/rtc-pcf2127.c | 35 +++++++++++++++++++++++++++++++++++ > > > > 1 file changed, 35 insertions(+) > > > > > > > > diff --git a/drivers/rtc/rtc-pcf2127.c b/drivers/rtc/rtc-pcf2127.c > > > > index 4148e135f935..68af4d0438b8 100644 > > > > --- a/drivers/rtc/rtc-pcf2127.c > > > > +++ b/drivers/rtc/rtc-pcf2127.c > > > > @@ -191,6 +191,7 @@ struct pcf21xx_config { > > > > int max_register; > > > > unsigned int has_nvmem:1; > > > > unsigned int has_bit_wd_ctl_cd0:1; > > > > + unsigned int has_int_a_b:1; /* PCF2131 supports two interrupt outputs. */ > > > > u8 regs_td_base; /* Time/data base registers. */ > > > > u8 regs_alarm_base; /* Alarm function base registers. */ > > > > u8 reg_wd_ctl; /* Watchdog control register. */ > > > > @@ -879,6 +880,7 @@ static struct pcf21xx_config pcf21xx_cfg[] = { > > > > .max_register = 0x1d, > > > > .has_nvmem = 1, > > > > .has_bit_wd_ctl_cd0 = 1, > > > > + .has_int_a_b = 0, > > > > .regs_td_base = PCF2127_REG_TIME_DATE_BASE, > > > > .regs_alarm_base = PCF2127_REG_ALARM_BASE, > > > > .reg_wd_ctl = PCF2127_REG_WD_CTL, > > > > @@ -902,6 +904,7 @@ static struct pcf21xx_config pcf21xx_cfg[] = { > > > > .max_register = 0x19, > > > > .has_nvmem = 0, > > > > .has_bit_wd_ctl_cd0 = 0, > > > > + .has_int_a_b = 0, > > > > .regs_td_base = PCF2127_REG_TIME_DATE_BASE, > > > > .regs_alarm_base = PCF2127_REG_ALARM_BASE, > > > > .reg_wd_ctl = PCF2127_REG_WD_CTL, > > > > @@ -925,6 +928,7 @@ static struct pcf21xx_config pcf21xx_cfg[] = { > > > > .max_register = 0x36, > > > > .has_nvmem = 0, > > > > .has_bit_wd_ctl_cd0 = 0, > > > > + .has_int_a_b = 1, > > > > .regs_td_base = PCF2131_REG_TIME_DATE_BASE, > > > > .regs_alarm_base = PCF2131_REG_ALARM_BASE, > > > > .reg_wd_ctl = PCF2131_REG_WD_CTL, > > > > @@ -1017,6 +1021,28 @@ static int pcf2127_enable_ts(struct device *dev, int ts_id) > > > > return ret; > > > > } > > > > > > > > +/* Route all interrupt sources to INT A pin. */ > > > > +static int pcf2127_configure_interrupt_pins(struct device *dev) > > > > +{ > > > > + struct pcf2127 *pcf2127 = dev_get_drvdata(dev); > > > > + int ret; > > > > + > > > > + /* Mask bits need to be cleared to enable corresponding > > > > + * interrupt source. > > > > + */ > > > > + ret = regmap_write(pcf2127->regmap, > > > > + PCF2131_REG_INT_A_MASK1, 0); > > > > + if (ret) > > > > + return ret; > > > > + > > > > + ret = regmap_write(pcf2127->regmap, > > > > + PCF2131_REG_INT_A_MASK2, 0); > > > > + if (ret) > > > > + return ret; > > > > + > > > > + return ret; > > > > +} > > > > + > > > > static int pcf2127_probe(struct device *dev, struct regmap *regmap, > > > > int alarm_irq, const char *name, const struct pcf21xx_config *config) > > > > { > > > > @@ -1076,6 +1102,15 @@ static int pcf2127_probe(struct device *dev, struct regmap *regmap, > > > > set_bit(RTC_FEATURE_ALARM, pcf2127->rtc->features); > > > > } > > > > > > > > + if (pcf2127->cfg->has_int_a_b) { > > > > + /* Configure int A/B pins, independently of alarm_irq. */ > > > > + ret = pcf2127_configure_interrupt_pins(dev); > > > > + if (ret) { > > > > + dev_err(dev, "failed to configure interrupt pins\n"); > > > > + return ret; > > > > + } > > > > + } > > > > + > > > > if (pcf2127->cfg->has_nvmem) { > > > > struct nvmem_config nvmem_cfg = { > > > > .priv = pcf2127, > > > > -- > > > > 2.30.2 > > > > > > > > > > -- > > > Alexandre Belloni, co-owner and COO, Bootlin > > > Embedded Linux and Kernel engineering > > > https://bootlin.com > > > > > > > > > -- > > Hugo Villeneuve <hugo@hugovil.com> > > > -- > Hugo Villeneuve
On 21/06/2023 21:24:37+0200, Alexandre Belloni wrote: > On 11/05/2023 13:19:58-0400, Hugo Villeneuve wrote: > > On Mon, 23 Jan 2023 15:52:40 -0500 > > Hugo Villeneuve <hugo@hugovil.com> wrote: > > > > > On Fri, 20 Jan 2023 17:56:39 +0100 > > > Alexandre Belloni <alexandre.belloni@bootlin.com> wrote: > > > > > > > On 15/12/2022 10:02:09-0500, Hugo Villeneuve wrote: > > > > > From: Hugo Villeneuve <hvilleneuve@dimonoff.com> > > > > > > > > > > The PCF2127 and PCF2129 have one output interrupt pin. The PCF2131 has > > > > > two, named INT_A and INT_B. The hardware support that any interrupt > > > > > source can be routed to either one or both of them. > > > > > > > > > > Force all interrupt sources to go to the INT A pin. > > > > > > > > > > Support to route any interrupt source to INT A/B pins is not supported > > > > > by this driver at the moment. > > > > > > > > > > > > > The main issue with this is that this will created a breaking change > > > > once someone needs support for INTB > > > > > > We already had a discussion about this a while ago: > > > > > > https://lore.kernel.org/linux-rtc/7be3f9541eaed7e17e334267e49665f442b1b458.camel@dimonoff.com/ > > > > > > What exactly do you suggest? I personnaly don't have any need for INTB at the moment and I would prefer to avoid the great complexity of supporting any combination of routing interrupts to any A ou pins. > > > > Hi Alexandre, > > a few months later, and I am still waiting for your feedback on this (and other questions/interrogations I raised for other patches related to this series) to submit the next version of this patch series. > > > > Can you have a look at it and provide some answers? > > > > I'm very very sorry this takes so long. For this one, I don't have a > precise idea. I guess we could have one property per pin with a mask of > the interrupts we are interested in. That would cover all the use cases. > For example, a PMIC could take the alarms on INTB and the CPU could have > alarms, battery low and UIE on INTA. As the mask for INTA and INTB are set to have interrupts on both by default, maybe you could keep that in a separate series so we can wait for the DT maintainer to give their opinion. > > > > Thank you, > > Hugo. > > > > > > > > > Signed-off-by: Hugo Villeneuve <hvilleneuve@dimonoff.com> > > > > > --- > > > > > drivers/rtc/rtc-pcf2127.c | 35 +++++++++++++++++++++++++++++++++++ > > > > > 1 file changed, 35 insertions(+) > > > > > > > > > > diff --git a/drivers/rtc/rtc-pcf2127.c b/drivers/rtc/rtc-pcf2127.c > > > > > index 4148e135f935..68af4d0438b8 100644 > > > > > --- a/drivers/rtc/rtc-pcf2127.c > > > > > +++ b/drivers/rtc/rtc-pcf2127.c > > > > > @@ -191,6 +191,7 @@ struct pcf21xx_config { > > > > > int max_register; > > > > > unsigned int has_nvmem:1; > > > > > unsigned int has_bit_wd_ctl_cd0:1; > > > > > + unsigned int has_int_a_b:1; /* PCF2131 supports two interrupt outputs. */ > > > > > u8 regs_td_base; /* Time/data base registers. */ > > > > > u8 regs_alarm_base; /* Alarm function base registers. */ > > > > > u8 reg_wd_ctl; /* Watchdog control register. */ > > > > > @@ -879,6 +880,7 @@ static struct pcf21xx_config pcf21xx_cfg[] = { > > > > > .max_register = 0x1d, > > > > > .has_nvmem = 1, > > > > > .has_bit_wd_ctl_cd0 = 1, > > > > > + .has_int_a_b = 0, > > > > > .regs_td_base = PCF2127_REG_TIME_DATE_BASE, > > > > > .regs_alarm_base = PCF2127_REG_ALARM_BASE, > > > > > .reg_wd_ctl = PCF2127_REG_WD_CTL, > > > > > @@ -902,6 +904,7 @@ static struct pcf21xx_config pcf21xx_cfg[] = { > > > > > .max_register = 0x19, > > > > > .has_nvmem = 0, > > > > > .has_bit_wd_ctl_cd0 = 0, > > > > > + .has_int_a_b = 0, > > > > > .regs_td_base = PCF2127_REG_TIME_DATE_BASE, > > > > > .regs_alarm_base = PCF2127_REG_ALARM_BASE, > > > > > .reg_wd_ctl = PCF2127_REG_WD_CTL, > > > > > @@ -925,6 +928,7 @@ static struct pcf21xx_config pcf21xx_cfg[] = { > > > > > .max_register = 0x36, > > > > > .has_nvmem = 0, > > > > > .has_bit_wd_ctl_cd0 = 0, > > > > > + .has_int_a_b = 1, > > > > > .regs_td_base = PCF2131_REG_TIME_DATE_BASE, > > > > > .regs_alarm_base = PCF2131_REG_ALARM_BASE, > > > > > .reg_wd_ctl = PCF2131_REG_WD_CTL, > > > > > @@ -1017,6 +1021,28 @@ static int pcf2127_enable_ts(struct device *dev, int ts_id) > > > > > return ret; > > > > > } > > > > > > > > > > +/* Route all interrupt sources to INT A pin. */ > > > > > +static int pcf2127_configure_interrupt_pins(struct device *dev) > > > > > +{ > > > > > + struct pcf2127 *pcf2127 = dev_get_drvdata(dev); > > > > > + int ret; > > > > > + > > > > > + /* Mask bits need to be cleared to enable corresponding > > > > > + * interrupt source. > > > > > + */ > > > > > + ret = regmap_write(pcf2127->regmap, > > > > > + PCF2131_REG_INT_A_MASK1, 0); > > > > > + if (ret) > > > > > + return ret; > > > > > + > > > > > + ret = regmap_write(pcf2127->regmap, > > > > > + PCF2131_REG_INT_A_MASK2, 0); > > > > > + if (ret) > > > > > + return ret; > > > > > + > > > > > + return ret; > > > > > +} > > > > > + > > > > > static int pcf2127_probe(struct device *dev, struct regmap *regmap, > > > > > int alarm_irq, const char *name, const struct pcf21xx_config *config) > > > > > { > > > > > @@ -1076,6 +1102,15 @@ static int pcf2127_probe(struct device *dev, struct regmap *regmap, > > > > > set_bit(RTC_FEATURE_ALARM, pcf2127->rtc->features); > > > > > } > > > > > > > > > > + if (pcf2127->cfg->has_int_a_b) { > > > > > + /* Configure int A/B pins, independently of alarm_irq. */ > > > > > + ret = pcf2127_configure_interrupt_pins(dev); > > > > > + if (ret) { > > > > > + dev_err(dev, "failed to configure interrupt pins\n"); > > > > > + return ret; > > > > > + } > > > > > + } > > > > > + > > > > > if (pcf2127->cfg->has_nvmem) { > > > > > struct nvmem_config nvmem_cfg = { > > > > > .priv = pcf2127, > > > > > -- > > > > > 2.30.2 > > > > > > > > > > > > > -- > > > > Alexandre Belloni, co-owner and COO, Bootlin > > > > Embedded Linux and Kernel engineering > > > > https://bootlin.com > > > > > > > > > > > > > -- > > > Hugo Villeneuve <hugo@hugovil.com> > > > > > > -- > > Hugo Villeneuve > > -- > Alexandre Belloni, co-owner and COO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com
On Wed, 21 Jun 2023 21:26:21 +0200 Alexandre Belloni <alexandre.belloni@bootlin.com> wrote: > On 21/06/2023 21:24:37+0200, Alexandre Belloni wrote: > > On 11/05/2023 13:19:58-0400, Hugo Villeneuve wrote: > > > On Mon, 23 Jan 2023 15:52:40 -0500 > > > Hugo Villeneuve <hugo@hugovil.com> wrote: > > > > > > > On Fri, 20 Jan 2023 17:56:39 +0100 > > > > Alexandre Belloni <alexandre.belloni@bootlin.com> wrote: > > > > > > > > > On 15/12/2022 10:02:09-0500, Hugo Villeneuve wrote: > > > > > > From: Hugo Villeneuve <hvilleneuve@dimonoff.com> > > > > > > > > > > > > The PCF2127 and PCF2129 have one output interrupt pin. The PCF2131 has > > > > > > two, named INT_A and INT_B. The hardware support that any interrupt > > > > > > source can be routed to either one or both of them. > > > > > > > > > > > > Force all interrupt sources to go to the INT A pin. > > > > > > > > > > > > Support to route any interrupt source to INT A/B pins is not supported > > > > > > by this driver at the moment. > > > > > > > > > > > > > > > > The main issue with this is that this will created a breaking change > > > > > once someone needs support for INTB > > > > > > > > We already had a discussion about this a while ago: > > > > > > > > https://lore.kernel.org/linux-rtc/7be3f9541eaed7e17e334267e49665f442b1b458.camel@dimonoff.com/ > > > > > > > > What exactly do you suggest? I personnaly don't have any need for INTB at the moment and I would prefer to avoid the great complexity of supporting any combination of routing interrupts to any A ou pins. > > > > > > Hi Alexandre, > > > a few months later, and I am still waiting for your feedback on this (and other questions/interrogations I raised for other patches related to this series) to submit the next version of this patch series. > > > > > > Can you have a look at it and provide some answers? > > > > > > > I'm very very sorry this takes so long. For this one, I don't have a > > precise idea. I guess we could have one property per pin with a mask of > > the interrupts we are interested in. That would cover all the use cases. > > For example, a PMIC could take the alarms on INTB and the CPU could have > > alarms, battery low and UIE on INTA. > > As the mask for INTA and INTB are set to have interrupts on both by > default, maybe you could keep that in a separate series so we can wait > for the DT maintainer to give their opinion. Hi Alexandre, great, this will allow us to focus on closing this current series, and I will prepare a new series specifically for handling interrupts A and B after. I have finished implementing all the changes requested during V3 review, and will submit V4 soon. Thank you, Hugo. > > > > > > Signed-off-by: Hugo Villeneuve <hvilleneuve@dimonoff.com> > > > > > > --- > > > > > > drivers/rtc/rtc-pcf2127.c | 35 +++++++++++++++++++++++++++++++++++ > > > > > > 1 file changed, 35 insertions(+) > > > > > > > > > > > > diff --git a/drivers/rtc/rtc-pcf2127.c b/drivers/rtc/rtc-pcf2127.c > > > > > > index 4148e135f935..68af4d0438b8 100644 > > > > > > --- a/drivers/rtc/rtc-pcf2127.c > > > > > > +++ b/drivers/rtc/rtc-pcf2127.c > > > > > > @@ -191,6 +191,7 @@ struct pcf21xx_config { > > > > > > int max_register; > > > > > > unsigned int has_nvmem:1; > > > > > > unsigned int has_bit_wd_ctl_cd0:1; > > > > > > + unsigned int has_int_a_b:1; /* PCF2131 supports two interrupt outputs. */ > > > > > > u8 regs_td_base; /* Time/data base registers. */ > > > > > > u8 regs_alarm_base; /* Alarm function base registers. */ > > > > > > u8 reg_wd_ctl; /* Watchdog control register. */ > > > > > > @@ -879,6 +880,7 @@ static struct pcf21xx_config pcf21xx_cfg[] = { > > > > > > .max_register = 0x1d, > > > > > > .has_nvmem = 1, > > > > > > .has_bit_wd_ctl_cd0 = 1, > > > > > > + .has_int_a_b = 0, > > > > > > .regs_td_base = PCF2127_REG_TIME_DATE_BASE, > > > > > > .regs_alarm_base = PCF2127_REG_ALARM_BASE, > > > > > > .reg_wd_ctl = PCF2127_REG_WD_CTL, > > > > > > @@ -902,6 +904,7 @@ static struct pcf21xx_config pcf21xx_cfg[] = { > > > > > > .max_register = 0x19, > > > > > > .has_nvmem = 0, > > > > > > .has_bit_wd_ctl_cd0 = 0, > > > > > > + .has_int_a_b = 0, > > > > > > .regs_td_base = PCF2127_REG_TIME_DATE_BASE, > > > > > > .regs_alarm_base = PCF2127_REG_ALARM_BASE, > > > > > > .reg_wd_ctl = PCF2127_REG_WD_CTL, > > > > > > @@ -925,6 +928,7 @@ static struct pcf21xx_config pcf21xx_cfg[] = { > > > > > > .max_register = 0x36, > > > > > > .has_nvmem = 0, > > > > > > .has_bit_wd_ctl_cd0 = 0, > > > > > > + .has_int_a_b = 1, > > > > > > .regs_td_base = PCF2131_REG_TIME_DATE_BASE, > > > > > > .regs_alarm_base = PCF2131_REG_ALARM_BASE, > > > > > > .reg_wd_ctl = PCF2131_REG_WD_CTL, > > > > > > @@ -1017,6 +1021,28 @@ static int pcf2127_enable_ts(struct device *dev, int ts_id) > > > > > > return ret; > > > > > > } > > > > > > > > > > > > +/* Route all interrupt sources to INT A pin. */ > > > > > > +static int pcf2127_configure_interrupt_pins(struct device *dev) > > > > > > +{ > > > > > > + struct pcf2127 *pcf2127 = dev_get_drvdata(dev); > > > > > > + int ret; > > > > > > + > > > > > > + /* Mask bits need to be cleared to enable corresponding > > > > > > + * interrupt source. > > > > > > + */ > > > > > > + ret = regmap_write(pcf2127->regmap, > > > > > > + PCF2131_REG_INT_A_MASK1, 0); > > > > > > + if (ret) > > > > > > + return ret; > > > > > > + > > > > > > + ret = regmap_write(pcf2127->regmap, > > > > > > + PCF2131_REG_INT_A_MASK2, 0); > > > > > > + if (ret) > > > > > > + return ret; > > > > > > + > > > > > > + return ret; > > > > > > +} > > > > > > + > > > > > > static int pcf2127_probe(struct device *dev, struct regmap *regmap, > > > > > > int alarm_irq, const char *name, const struct pcf21xx_config *config) > > > > > > { > > > > > > @@ -1076,6 +1102,15 @@ static int pcf2127_probe(struct device *dev, struct regmap *regmap, > > > > > > set_bit(RTC_FEATURE_ALARM, pcf2127->rtc->features); > > > > > > } > > > > > > > > > > > > + if (pcf2127->cfg->has_int_a_b) { > > > > > > + /* Configure int A/B pins, independently of alarm_irq. */ > > > > > > + ret = pcf2127_configure_interrupt_pins(dev); > > > > > > + if (ret) { > > > > > > + dev_err(dev, "failed to configure interrupt pins\n"); > > > > > > + return ret; > > > > > > + } > > > > > > + } > > > > > > + > > > > > > if (pcf2127->cfg->has_nvmem) { > > > > > > struct nvmem_config nvmem_cfg = { > > > > > > .priv = pcf2127, > > > > > > -- > > > > > > 2.30.2 > > > > > > > > > > > > > > > > -- > > > > > Alexandre Belloni, co-owner and COO, Bootlin > > > > > Embedded Linux and Kernel engineering > > > > > https://bootlin.com > > > > > > > > > > > > > > > > > -- > > > > Hugo Villeneuve <hugo@hugovil.com> > > > > > > > > > -- > > > Hugo Villeneuve > > > > -- > > Alexandre Belloni, co-owner and COO, Bootlin > > Embedded Linux and Kernel engineering > > https://bootlin.com > > -- > Alexandre Belloni, co-owner and COO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com >
diff --git a/drivers/rtc/rtc-pcf2127.c b/drivers/rtc/rtc-pcf2127.c index 4148e135f935..68af4d0438b8 100644 --- a/drivers/rtc/rtc-pcf2127.c +++ b/drivers/rtc/rtc-pcf2127.c @@ -191,6 +191,7 @@ struct pcf21xx_config { int max_register; unsigned int has_nvmem:1; unsigned int has_bit_wd_ctl_cd0:1; + unsigned int has_int_a_b:1; /* PCF2131 supports two interrupt outputs. */ u8 regs_td_base; /* Time/data base registers. */ u8 regs_alarm_base; /* Alarm function base registers. */ u8 reg_wd_ctl; /* Watchdog control register. */ @@ -879,6 +880,7 @@ static struct pcf21xx_config pcf21xx_cfg[] = { .max_register = 0x1d, .has_nvmem = 1, .has_bit_wd_ctl_cd0 = 1, + .has_int_a_b = 0, .regs_td_base = PCF2127_REG_TIME_DATE_BASE, .regs_alarm_base = PCF2127_REG_ALARM_BASE, .reg_wd_ctl = PCF2127_REG_WD_CTL, @@ -902,6 +904,7 @@ static struct pcf21xx_config pcf21xx_cfg[] = { .max_register = 0x19, .has_nvmem = 0, .has_bit_wd_ctl_cd0 = 0, + .has_int_a_b = 0, .regs_td_base = PCF2127_REG_TIME_DATE_BASE, .regs_alarm_base = PCF2127_REG_ALARM_BASE, .reg_wd_ctl = PCF2127_REG_WD_CTL, @@ -925,6 +928,7 @@ static struct pcf21xx_config pcf21xx_cfg[] = { .max_register = 0x36, .has_nvmem = 0, .has_bit_wd_ctl_cd0 = 0, + .has_int_a_b = 1, .regs_td_base = PCF2131_REG_TIME_DATE_BASE, .regs_alarm_base = PCF2131_REG_ALARM_BASE, .reg_wd_ctl = PCF2131_REG_WD_CTL, @@ -1017,6 +1021,28 @@ static int pcf2127_enable_ts(struct device *dev, int ts_id) return ret; } +/* Route all interrupt sources to INT A pin. */ +static int pcf2127_configure_interrupt_pins(struct device *dev) +{ + struct pcf2127 *pcf2127 = dev_get_drvdata(dev); + int ret; + + /* Mask bits need to be cleared to enable corresponding + * interrupt source. + */ + ret = regmap_write(pcf2127->regmap, + PCF2131_REG_INT_A_MASK1, 0); + if (ret) + return ret; + + ret = regmap_write(pcf2127->regmap, + PCF2131_REG_INT_A_MASK2, 0); + if (ret) + return ret; + + return ret; +} + static int pcf2127_probe(struct device *dev, struct regmap *regmap, int alarm_irq, const char *name, const struct pcf21xx_config *config) { @@ -1076,6 +1102,15 @@ static int pcf2127_probe(struct device *dev, struct regmap *regmap, set_bit(RTC_FEATURE_ALARM, pcf2127->rtc->features); } + if (pcf2127->cfg->has_int_a_b) { + /* Configure int A/B pins, independently of alarm_irq. */ + ret = pcf2127_configure_interrupt_pins(dev); + if (ret) { + dev_err(dev, "failed to configure interrupt pins\n"); + return ret; + } + } + if (pcf2127->cfg->has_nvmem) { struct nvmem_config nvmem_cfg = { .priv = pcf2127,