From patchwork Mon Oct 31 06:54:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: glasveze@delta.nl X-Patchwork-Id: 13127 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2151317wru; Sun, 30 Oct 2022 23:55:36 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7LBxPnbZl4ohsZ1XInoUWPw5GhqWk79biM4HI7FY2ddleZKPdT+BmSwEWeEi+KJqVE4Zm1 X-Received: by 2002:a05:6402:c95:b0:463:6034:3dd9 with SMTP id cm21-20020a0564020c9500b0046360343dd9mr3553980edb.115.1667199336359; Sun, 30 Oct 2022 23:55:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667199336; cv=none; d=google.com; s=arc-20160816; b=diT5ev9jk9xkEKXiSB16Ys99m0C0M7/twgXpdw4pGD6uqih2crEfkKLRR9/ctamFz8 /hpcDydQ2eKnLnR5DGuqWiqXMKUvhxbmisKQ4FpHnhck10q0Mygsd2p1boAaPAABJHLO KqkqETg7Bm4mN/yfuT1LY2WVewfI3GQ6oEcvHqJeaXD1OhzzGTaYfv3Pm8ak9Ezmk+Zp aldw1xv09f/QYty651JDs0rGsSX0F7IZ+/GpXnjtY7eF4BTfO9kOtnEHKgVyajZ1iUPR 4w7qn0FanzOBCtSMRYjKGSK/nWUiv7+YVTpI5L1+RHpUR1ieQlMzzPJS5m1fDbmLipHU T6gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from; bh=xlDW0sta6QxKQ1gC5wEbr7tspMCD/A8KETvX+KN6ivM=; b=MrG/Jcag1nrm7Oggy2eoNPmRx1viUiP3W71T/SZmfSymgoDdn7eCzCf8+y1NiegGB0 4C2dXCnOqmbo+joxQszCxaZIZRaiuRpXooIFgwh7qNnTOSe1IUzFjZrpYDunyM6pzJQP 9/oTdtrqsauVeElzrA8rO4c6A09DtAfJC94pffpcjNrgQ2dJbB5s0wJ8QXadCgWRZ81z +KxKr/3gLIXtpoyWRpJ16DDNltJFiCblvu0VOSAfirIjccYQoMwH1qZ6wvXIWvnv9yfw TTuX/d5oTyUwKbFWM9Rox2mXFWyn+1WX9IHn2lwBsZWQNGv0do9FR5I478KUya3ClTZo rp8A== ARC-Authentication-Results: i=1; mx.google.com; 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 s3-20020a170906c30300b0078e1e77f443si6484765ejz.418.2022.10.30.23.55.13; Sun, 30 Oct 2022 23:55:36 -0700 (PDT) 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; 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 S229720AbiJaGyt (ORCPT + 99 others); Mon, 31 Oct 2022 02:54:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229726AbiJaGyP (ORCPT ); Mon, 31 Oct 2022 02:54:15 -0400 Received: from spamfilter04.delta.nl (spamfilter04.delta.nl [217.102.255.204]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A9D5BC30; Sun, 30 Oct 2022 23:54:13 -0700 (PDT) Received: from host-ubmmyvj.static.zeelandnet.nl ([217.102.255.198] helo=mail.zeelandnet.nl) by spamfilter04.delta.nl with esmtp (Exim 4.92) (envelope-from ) id 1opOgY-0007fF-Vc; Mon, 31 Oct 2022 07:54:18 +0100 X-Sender-IP: 204.168.188.16 Received: from phenom.domain_not_set.invalid (016-188-168-204.dynamic.caiway.nl [204.168.188.16]) (Authenticated sender: glasveze@delta.nl) by mail.zeelandnet.nl (Postfix) with ESMTPA; Mon, 31 Oct 2022 07:54:06 +0100 (CET) From: glasveze@delta.nl To: linux-rtc@vger.kernel.org, devicetree@vger.kernel.org Cc: a.zummo@towertech.it, alexandre.belloni@bootlin.com, robh+dt@kernel.org, linux-kernel@vger.kernel.org, Mike Looijmans Subject: [PATCH 1/2] dt-bindings: rtc: ds1307: Add support for Epson RX8111 Date: Mon, 31 Oct 2022 07:54:06 +0100 Message-Id: <20221031065406.5684-1-glasveze@delta.nl> X-Mailer: git-send-email 2.17.1 X-Originating-IP: 217.102.255.198 X-DELTA-Domain: zeelandnet.nl X-DELTA-Username: 217.102.255.198 Authentication-Results: delta.nl; auth=pass smtp.auth=217.102.255.198@zeelandnet.nl X-DELTA-Outgoing-Class: ham X-DELTA-Outgoing-Evidence: SB/global_tokens (0.00228891675809) X-Recommended-Action: accept X-Filter-ID: Pt3MvcO5N4iKaDQ5O6lkdGlMVN6RH8bjRMzItlySaT8pe3h4GQsYWORTVb8eeiC2PUtbdvnXkggZ 3YnVId/Y5jcf0yeVQAvfjHznO7+bT5wqSBOxlRVmV45FJ8CYZCUIt8C9mOBdONdnsxgsk1D2p824 MyjFWyZM3gh7kZ3N2o0EIJgF/Accv4lLtE4TWYNIJfRvS2W4wMvaxnuacmrzO63tkTFTGbdbrgNb v6tn6AfNVkAfS7Ep78PSHeldbo1JKbK8f51zBH5eEJ3C3XgargegwxR90Cn/9qseLqmc4NPbC8dt /CV3fELBVC/AS5PvDdqpp0PwvA0T6h+PF2lQM+UptZeMWqwM87Sr86NOUNNXJcphKwwtkJ0il/aM E1JA8sEks4fS8ifuVDuaqtVJkeKVse1sVhWabI0/+PN3sIJkYWvWNZaZ0U+2WAj4IohtB5Wku8Z+ HjscnTdG7OzuuhO9UWZR6DygHL2uL+fpoKfkmbmoofKALtn/uXeLjRifqraCXgGgCDOczZcC0s+1 rMP5P71XxSY6Bud0I4P+npSUhdUKb/ejZlGAm5aYDC522S9lxf1W0a5eEMc7eunFGmvh9GiopPC0 UD6wcbWJMl9n+3TblTAKGom+tz90NlkS2XisTmNxpUcDTKRyhJJrVG18n/RbDuZUqQqTgt7VC9CP AtwL+re6Uz43RIVa9gaV9SxdNCEKGT/Znx3aa/MYykHvm3Pq/TMVhLiLVSlbDnIwjZjn7QogpmK0 eNWmS0n931/E3ahF5MMcDI7KdpjQKTxLZ9y9gIsjefalsT+at7OgkXa3w91ZfeRDvUeK4qGp36oy bTZpB4Wv6ElyTZU8c8TJRwRvw2AEVD26W3GQDiXO7ujGdCQPoAa02/HGzYqRDuOlu0DGJJ/yi3xl Qv+7Ye5iAwG6iqW74zZvnRHNN8z2hfLHYZfhIu9CjVUoDSebyrFWzpgoFwAM9mR6li7gxtc7xQ2h dHEckmcQGOuBPq9rt4dOEn9WJA7yfGK6BkBGG0mLtmuzbfeFGb2hZWsDt/fmCo6d12yvI0wed/0Q udAWg/9etw9TIOEergZFaJ91hnCJ4odIJjOae1BAYoct5jhM/YMnopl8+mg4rtJ+nU4vAYpdTk6U w5YlH8w8IsnwctgzcDoFd+96Xw4QUNtTnctHmbpOK0RKd6E2YmmZo3u87jDsfKYWdCAewd7hjSHD v1yU8GDv9kO7wH7K9y8hX1+STHELjwkcdmgWo2JoBLv+psOGtMjI9qGEbmhFtfi+crcUX31Co0Zg NRr7F4I7T5HIIbgqOGhNKCbnOkqTNOYxCCw6fqSlOTqlv1QhfFxXVbH+G+02TrybDOP2Co+U5w== X-Report-Abuse-To: spam@spamfilter03.delta.nl X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, T_SPF_PERMERROR autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748185211263667042?= X-GMAIL-MSGID: =?utf-8?q?1748185211263667042?= From: Mike Looijmans The rx_8111 is quite similar to the rx_8030. This adds support for this chip to the ds1307 driver. This adds the entry to the devicetree bindings. Signed-off-by: Mike Looijmans --- Documentation/devicetree/bindings/rtc/rtc-ds1307.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/rtc/rtc-ds1307.yaml b/Documentation/devicetree/bindings/rtc/rtc-ds1307.yaml index 98d10e680144..a9590da64b84 100644 --- a/Documentation/devicetree/bindings/rtc/rtc-ds1307.yaml +++ b/Documentation/devicetree/bindings/rtc/rtc-ds1307.yaml @@ -30,6 +30,7 @@ properties: - pericom,pt7c4338 - epson,rx8025 - isil,isl12057 + - epson,rx8111 - epson,rx8130 - items: From patchwork Mon Oct 31 06:54:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: glasveze@delta.nl X-Patchwork-Id: 13128 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2151318wru; Sun, 30 Oct 2022 23:55:36 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4hpJFq93HywKMQV58sj3jwRneEihWAVxSvfIZ4U1CiwpAP+Gq3nV5oyKLXdLoaIyYo5JgD X-Received: by 2002:a17:907:78b:b0:741:3d29:33d2 with SMTP id xd11-20020a170907078b00b007413d2933d2mr12056583ejb.103.1667199336348; Sun, 30 Oct 2022 23:55:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667199336; cv=none; d=google.com; s=arc-20160816; b=AcneAD0Mh6p+p2leYrIiqpvSiEdKByqsbzxWRR4YdAE03DR8Djv40XfhuipnJbUccW dfpe1deYxtbuF/wHllMrpG1C2rKqXkHkuJmhLywJvoYn27NYPr0U9CtYRVgSCyNiJHQF iPlviwsqHPDrb2mNmbg4CLqYeTovLSMjD4bWTw/w8kWLl8e3bPpl2CRtjjsnPaBb4Pi6 XhpthMe2gEBg33r8tcOjaJcbmho8LAbgs7rbiWlGJWWHoBmgyqEGCM9clr9pvHWhxTpX 05WYJ9HZKD7GuSUV9Ln8ugY8OOjUGaJUz4QRCsENfZc4+M+BYFxJZyRUo6mVkR4g5oWe QXvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from; bh=ViQ2QMtGcDZLR1TUgl1HQ1s4g9d1gdcaOWkXuIbsz7U=; b=D9gEyEekPixOpaWEkNJLCwWKBjUFKjGkZewjHoqRwFJIo8Yg43ItiGf5xBpXAqwMfJ k3xi9IZpvk/Rof7FkhcNGi029WWN6V6UPE4uSaBfDWRPvj0PPGmPcrBxpmEVMIpcyuEk wM62lmRjD00akdp7Ie7BGnoMW8c1igCC72do2p5P6LP3liQx/O4HuS1UHlz9TSjcFDHl sFYTvJmBwwMefl/dpbBjrmfxXPuFUEPC5LQAlSzq7uuNVc6kXzazKkFefyOxhrGxtLGE fHngBPbfhhS36H+I6vNyItvyeG4IFwnljiPQUKNmkqfFsT7hmA6qNHeILXGGsCjQxHWa xBuA== ARC-Authentication-Results: i=1; mx.google.com; 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 ne31-20020a1709077b9f00b007adb78db1adsi7076742ejc.804.2022.10.30.23.55.12; Sun, 30 Oct 2022 23:55:36 -0700 (PDT) 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; 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 S229544AbiJaGzB (ORCPT + 99 others); Mon, 31 Oct 2022 02:55:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229742AbiJaGy5 (ORCPT ); Mon, 31 Oct 2022 02:54:57 -0400 Received: from spamfilter04.delta.nl (spamfilter04.delta.nl [217.102.255.204]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94563BF71; Sun, 30 Oct 2022 23:54:51 -0700 (PDT) Received: from host-ubmmyvj.static.zeelandnet.nl ([217.102.255.198] helo=mail.zeelandnet.nl) by spamfilter04.delta.nl with esmtp (Exim 4.92) (envelope-from ) id 1opOhG-0007ki-1u; Mon, 31 Oct 2022 07:54:59 +0100 X-Sender-IP: 204.168.188.16 Received: from phenom.domain_not_set.invalid (016-188-168-204.dynamic.caiway.nl [204.168.188.16]) (Authenticated sender: glasveze@delta.nl) by mail.zeelandnet.nl (Postfix) with ESMTPA; Mon, 31 Oct 2022 07:54:48 +0100 (CET) From: glasveze@delta.nl To: linux-rtc@vger.kernel.org Cc: a.zummo@towertech.it, alexandre.belloni@bootlin.com, linux-kernel@vger.kernel.org, Mike Looijmans Subject: [PATCH 2/2] rtc: ds1307: Add support for Epson RX8111 Date: Mon, 31 Oct 2022 07:54:48 +0100 Message-Id: <20221031065448.5746-1-glasveze@delta.nl> X-Mailer: git-send-email 2.17.1 X-Originating-IP: 217.102.255.198 X-DELTA-Domain: zeelandnet.nl X-DELTA-Username: 217.102.255.198 Authentication-Results: delta.nl; auth=pass smtp.auth=217.102.255.198@zeelandnet.nl X-DELTA-Outgoing-Class: ham X-DELTA-Outgoing-Evidence: SB/global_tokens (4.205802721e-05) X-Recommended-Action: accept X-Filter-ID: Pt3MvcO5N4iKaDQ5O6lkdGlMVN6RH8bjRMzItlySaT+U6DmonnL9mbZRE2y8SnfwPUtbdvnXkggZ 3YnVId/Y5jcf0yeVQAvfjHznO7+bT5wqSBOxlRVmV45FJ8CYZCUIt8C9mOBdONdnsxgsk1D2p+TR pbxM0ISaJnfWkrHm7ptGxaGjWvYLz0l6AGvvRftgME5z5XaGE5NHNu7h534JJaFS4A6TO7+QrQWJ MkybRqNYGxLcRm31r7HJL906rtNS/YSALpmaJqtnIRDPv/5tBxXZU3s+BKeiVRn7TrBH4nejnKCo kQ2Ao8+ENfYcjPzAETJXdrVjqyOqfkkDsz2/xlY+5adZvWXoGLcQcb78Eui+mtbuPAbQ+aWD8hhQ CZMTEEe1sLzznCY3CGPOzCfYYPbQTl/SJIDeIbJV6Zcf430jRGDmKiHQCBmbL4/kVA5ilfR3t3lk efZwj1OjoVRNk0OBtfs8eND145V556pRoeWoiZFW8yMEtAB+QqbWN455cayBalMzNiQi+IaP6Ip3 l1/Gfk/thginq2iQcOP+mMhCFzRIiEpzynty7G1sAhwpazrLOzVL2cm1v+nUTthXE7Mvx4UmROlz fITQPwXDdef+Xt1YVt34tXjgAnyScrZDbgZGFmIP8t6jENaJPnk2Q0EqJ2YhaHYKPX4HHcW4fmLf d77XZbPqWAY81T0FayDkAbOrs4FPMK+W+hB4jPTBjMy+REZzZZBkbyPIV/jp5XA84mAL2fYZt/ag 6cJYhE+JR1THjBWZFF00ALVWc/sntqhVr03UHlrscRrHorFm3BMamUdylUIKhf3z2GAHxH7Inwey uebMOAyd9KE1KnR6Q/uNUZtOoISscGZbnZWaYNa7ovRVrcJH1vtKw3YgGZx3s6oM5c5v6nO6dxgr nLgL2IFyOv5cAKYGRAn40Vzq1+FjVbTBFy0HmZ7j54j5nbTw0F2VAitLyFstLTVGwdoo+nbOFKKz xACo90vCZrfvMYKWPHYo9X+hHrxPABGbYgYFQMAJdpT8SBGMx9Hio+WRxNN/qmhTU0uEq4SJAr3V DiJPpDjVqLlUsOzVGtyErgLSyB2oVjwpD0SDGnhQZ7XpT5syUIQR9jMhtWFgK0+Er7PJLlMHANA1 bs2R4iRcH3xv9Puiud/hROIkQBFx9BA5yh8iLgxxK8ttJOgE22ySLDlnuktNvxRB2uyScQ1h73J0 jHT9cO2eqPW6UlupkxNosx4GZ3jlszDBLqeHTFooTZCcSBYZDWQs5qlkvd6bQTUH3gkwE9mTsS/2 b1BN8Jw1rw== X-Report-Abuse-To: spam@spamfilter03.delta.nl X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, T_SPF_PERMERROR autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748185211209211678?= X-GMAIL-MSGID: =?utf-8?q?1748185211209211678?= From: Mike Looijmans The rx_8111 is quite similar to the rx_8030. This adds support for this chip to the ds1307 driver. Date/time and alarm registers are in the usual places. The nvmem is located at 0x40. Time stamping is not supported. Signed-off-by: Mike Looijmans --- drivers/rtc/rtc-ds1307.c | 129 ++++++++++++++++++++++++++++++++------- 1 file changed, 107 insertions(+), 22 deletions(-) diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c index d51565bcc189..f5f0f0d02fe0 100644 --- a/drivers/rtc/rtc-ds1307.c +++ b/drivers/rtc/rtc-ds1307.c @@ -46,6 +46,7 @@ enum ds_type { m41t11, mcp794xx, rx_8025, + rx_8111, rx_8130, last_ds_type /* always last */ /* rs5c372 too? different address... */ @@ -113,6 +114,14 @@ enum ds_type { # define RX8025_BIT_VDET 0x40 # define RX8025_BIT_XST 0x20 +#define RX8111_FLAG 0x1e +# define RX8111_FLAG_VLF BIT(1) +# define RX8111_FLAG_AF BIT(3) +#define RX8111_PWR_SWITCH_CTRL 0x32 +# define RX8111_PSC_SMP_INIEN BIT(6) +# define RX8111_PSC_SMP_CHGEN BIT(7) +#define RX8111_TIME_STAMP_BUF_CTRL 0x34 + #define RX8130_REG_ALARM_MIN 0x17 #define RX8130_REG_ALARM_HOUR 0x18 #define RX8130_REG_ALARM_WEEK_OR_DAY 0x19 @@ -205,6 +214,68 @@ struct chip_desc { static const struct chip_desc chips[last_ds_type]; +static int ds1307_check_voltage_lost(struct ds1307 *ds1307) +{ + int ret; + unsigned int reg; + unsigned int mask; + unsigned int regflag; + + switch (ds1307->type) { + case rx_8111: + reg = RX8111_FLAG; + mask = RX8111_FLAG_VLF; + break; + case rx_8130: + reg = RX8130_REG_FLAG; + mask = RX8130_REG_FLAG_VLF; + break; + default: + return 0; + } + + ret = regmap_read(ds1307->regmap, reg, ®flag); + if (ret) { + dev_err(ds1307->dev, "%s error %d\n", "read", ret); + return ret; + } + + if (regflag & mask) { + dev_warn_once(ds1307->dev, "oscillator failed, set time!\n"); + return -EINVAL; + } + + return 0; +} + +static int ds1307_clear_voltage_lost(struct ds1307 *ds1307) +{ + int ret; + unsigned int reg; + unsigned int mask; + + switch (ds1307->type) { + case rx_8111: + reg = RX8111_FLAG; + mask = (unsigned int)~RX8111_FLAG_VLF; + break; + case rx_8130: + reg = RX8130_REG_FLAG; + mask = (unsigned int)~RX8130_REG_FLAG_VLF; + break; + default: + return 0; + } + + ret = regmap_write(ds1307->regmap, reg, mask); + if (ret) { + dev_err(ds1307->dev, "%s error %d\n", "write", ret); + return ret; + } + + return 0; +} + static int ds1307_get_time(struct device *dev, struct rtc_time *t) { struct ds1307 *ds1307 = dev_get_drvdata(dev); @@ -212,19 +283,9 @@ static int ds1307_get_time(struct device *dev, struct rtc_time *t) const struct chip_desc *chip = &chips[ds1307->type]; u8 regs[7]; - if (ds1307->type == rx_8130) { - unsigned int regflag; - ret = regmap_read(ds1307->regmap, RX8130_REG_FLAG, ®flag); - if (ret) { - dev_err(dev, "%s error %d\n", "read", ret); - return ret; - } - - if (regflag & RX8130_REG_FLAG_VLF) { - dev_warn_once(dev, "oscillator failed, set time!\n"); - return -EINVAL; - } - } + ret = ds1307_check_voltage_lost(ds1307); + if (ret) + return ret; /* read the RTC date and time registers all at once */ ret = regmap_bulk_read(ds1307->regmap, chip->offset, regs, @@ -397,15 +458,9 @@ static int ds1307_set_time(struct device *dev, struct rtc_time *t) return result; } - if (ds1307->type == rx_8130) { - /* clear Voltage Loss Flag as data is available now */ - result = regmap_write(ds1307->regmap, RX8130_REG_FLAG, - ~(u8)RX8130_REG_FLAG_VLF); - if (result) { - dev_err(dev, "%s error %d\n", "write", result); - return result; - } - } + result = ds1307_clear_voltage_lost(ds1307); + if (result) + return result; return 0; } @@ -541,6 +596,17 @@ static u8 do_trickle_setup_ds1339(struct ds1307 *ds1307, u32 ohms, bool diode) return setup; } +static u8 do_trickle_setup_rx8111(struct ds1307 *ds1307, u32 ohms, bool diode) +{ + /* make sure that the backup battery is enabled */ + u8 setup = RX8111_PSC_SMP_INIEN; + + if (diode) + setup |= RX8111_PSC_SMP_CHGEN; + + return setup; +} + static u8 do_trickle_setup_rx8130(struct ds1307 *ds1307, u32 ohms, bool diode) { /* make sure that the backup battery is enabled */ @@ -1012,6 +1078,16 @@ static const struct chip_desc chips[last_ds_type] = { .century_bit = DS1337_BIT_CENTURY, .bbsqi_bit = DS3231_BIT_BBSQW, }, + [rx_8111] = { + .alarm = 1, + .nvram_offset = 0x40, + .nvram_size = 0x40, /* 0x40 .. 0x7F is user RAM */ + .offset = 0x10, + .irq_handler = rx8130_irq, + .rtc_ops = &rx8130_rtc_ops, + .trickle_charger_reg = RX8111_PWR_SWITCH_CTRL, + .do_trickle_setup = &do_trickle_setup_rx8111, + }, [rx_8130] = { .alarm = 1, /* this is battery backed SRAM */ @@ -1063,6 +1139,7 @@ static const struct i2c_device_id ds1307_id[] = { { "pt7c4338", ds_1307 }, { "rx8025", rx_8025 }, { "isl12057", ds_1337 }, + { "rx8111", rx_8111 }, { "rx8130", rx_8130 }, { } }; @@ -1137,6 +1214,10 @@ static const struct of_device_id ds1307_of_match[] = { .compatible = "isil,isl12057", .data = (void *)ds_1337 }, + { + .compatible = "epson,rx8111", + .data = (void *)rx_8111 + }, { .compatible = "epson,rx8130", .data = (void *)rx_8130 @@ -1880,6 +1961,10 @@ static int ds1307_probe(struct i2c_client *client, DS1307_REG_HOUR << 4 | 0x08, hour); } break; + case rx_8111: + /* Use memory as user RAM */ + regmap_write(ds1307->regmap, RX8111_TIME_STAMP_BUF_CTRL, 0); + break; case ds_1388: err = regmap_read(ds1307->regmap, DS1388_REG_CONTROL, &tmp); if (err) {