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=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT 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 1D733C2BB85 for ; Wed, 15 Apr 2020 16:37:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F2C5D2064A for ; Wed, 15 Apr 2020 16:37:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1416090AbgDOQh3 (ORCPT ); Wed, 15 Apr 2020 12:37:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1416169AbgDOQh0 (ORCPT ); Wed, 15 Apr 2020 12:37:26 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02C7FC061A0F for ; Wed, 15 Apr 2020 09:37:25 -0700 (PDT) Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7] helo=dude.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1jOl2S-0007eu-G5; Wed, 15 Apr 2020 18:37:24 +0200 From: Bastian Krause To: linux-rtc@vger.kernel.org Cc: Alessandro Zummo , Alexandre Belloni , Rob Herring , Arnaud Ebalard , Marek Vasut , devicetree@vger.kernel.org, kernel@pengutronix.de, Bastian Krause Subject: [PATCH 3/3] rtc: ds1307: make backup battery chargeable optionally Date: Wed, 15 Apr 2020 18:37:01 +0200 Message-Id: <20200415163701.21989-3-bst@pengutronix.de> X-Mailer: git-send-email 2.26.0.rc2 In-Reply-To: <20200415163701.21989-1-bst@pengutronix.de> References: <20200415163701.21989-1-bst@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: bst@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-rtc@vger.kernel.org Sender: linux-rtc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org RX8130_REG_CONTROL1_CHGEN decides whether the battery or the supercap should be charged or not. Introduce a new dt binding for that. Signed-off-by: Bastian Krause --- drivers/rtc/rtc-ds1307.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c index 5f0df60a71d1..451708402c3e 100644 --- a/drivers/rtc/rtc-ds1307.c +++ b/drivers/rtc/rtc-ds1307.c @@ -124,6 +124,7 @@ enum ds_type { #define RX8130_REG_CONTROL0_AIE BIT(3) #define RX8130_REG_CONTROL1 0x1f #define RX8130_REG_CONTROL1_INIEN BIT(4) +#define RX8130_REG_CONTROL1_CHGEN BIT(5) #define MCP794XX_REG_CONTROL 0x07 # define MCP794XX_BIT_ALM0_EN 0x10 @@ -1708,6 +1709,7 @@ static int ds1307_probe(struct i2c_client *client, const struct chip_desc *chip; bool want_irq; bool ds1307_can_wakeup_device = false; + bool enable_bb_charging = false; unsigned char regs[8]; struct ds1307_platform_data *pdata = dev_get_platdata(&client->dev); u8 trickle_charger_setup = 0; @@ -1774,6 +1776,9 @@ static int ds1307_probe(struct i2c_client *client, if (chip->alarm && of_property_read_bool(client->dev.of_node, "wakeup-source")) ds1307_can_wakeup_device = true; + + enable_bb_charging = of_property_read_bool(client->dev.of_node, + "aux-voltage-chargeable"); #endif switch (ds1307->type) { @@ -1879,8 +1884,13 @@ static int ds1307_probe(struct i2c_client *client, break; case rx_8130: /* make sure that the backup battery is enabled */ - regmap_write(ds1307->regmap, RX8130_REG_CONTROL1, - RX8130_REG_CONTROL1_INIEN); + regs[0] = RX8130_REG_CONTROL1_INIEN; + + /* set chargeable flag */ + if (enable_bb_charging) + regs[0] |= RX8130_REG_CONTROL1_CHGEN; + + regmap_write(ds1307->regmap, RX8130_REG_CONTROL1, regs[0]); break; default: break; -- 2.26.0.rc2