{"id":819189,"url":"http://patchwork.ozlabs.org/api/patches/819189/?format=json","web_url":"http://patchwork.ozlabs.org/project/devicetree-bindings/patch/20170927140345.5537-7-alexandre.belloni@free-electrons.com/","project":{"id":37,"url":"http://patchwork.ozlabs.org/api/projects/37/?format=json","name":"Devicetree Bindings","link_name":"devicetree-bindings","list_id":"devicetree.vger.kernel.org","list_email":"devicetree@vger.kernel.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170927140345.5537-7-alexandre.belloni@free-electrons.com>","list_archive_url":null,"date":"2017-09-27T14:03:45","name":"[v2,6/6] dt-bindings: rtc: merge ds1339 in ds1307 documentation","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"8e94c0a1a8fe32c94943f4c995a72c5b352b8e3b","submitter":{"id":26276,"url":"http://patchwork.ozlabs.org/api/people/26276/?format=json","name":"Alexandre Belloni","email":"alexandre.belloni@free-electrons.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/devicetree-bindings/patch/20170927140345.5537-7-alexandre.belloni@free-electrons.com/mbox/","series":[{"id":5377,"url":"http://patchwork.ozlabs.org/api/series/5377/?format=json","web_url":"http://patchwork.ozlabs.org/project/devicetree-bindings/list/?series=5377","date":"2017-09-27T14:03:39","name":"dt-bindings: rtc: document existing bindings","version":2,"mbox":"http://patchwork.ozlabs.org/series/5377/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/819189/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/819189/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming-dt@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming-dt@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=devicetree-owner@vger.kernel.org; receiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3y2KMb4KH0z9tXw\n\tfor ;\n\tThu, 28 Sep 2017 00:04:59 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752030AbdI0OEd (ORCPT\n\t);\n\tWed, 27 Sep 2017 10:04:33 -0400","from mail.free-electrons.com ([62.4.15.54]:38067 \"EHLO\n\tmail.free-electrons.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1753264AbdI0ODv (ORCPT\n\t); Wed, 27 Sep 2017 10:03:51 -0400","by mail.free-electrons.com (Postfix, from userid 110)\n\tid 485AA208BC; Wed, 27 Sep 2017 16:03:49 +0200 (CEST)","from localhost (242.171.71.37.rev.sfr.net [37.71.171.242])\n\tby mail.free-electrons.com (Postfix) with ESMTPSA id 2245B20892;\n\tWed, 27 Sep 2017 16:03:49 +0200 (CEST)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on\n\tmail.free-electrons.com","X-Spam-Level":"","X-Spam-Status":"No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT,\n\tURIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0","From":"Alexandre Belloni ","To":"linux-rtc@vger.kernel.org","Cc":"linux-kernel@vger.kernel.org, Rob Herring ,\n\tdevicetree@vger.kernel.org,\n\tAlexandre Belloni ","Subject":"[PATCH v2 6/6] dt-bindings: rtc: merge ds1339 in ds1307\n\tdocumentation","Date":"Wed, 27 Sep 2017 16:03:45 +0200","Message-Id":"<20170927140345.5537-7-alexandre.belloni@free-electrons.com>","X-Mailer":"git-send-email 2.14.2","In-Reply-To":"<20170927140345.5537-1-alexandre.belloni@free-electrons.com>","References":"<20170927140345.5537-1-alexandre.belloni@free-electrons.com>","Sender":"devicetree-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"devicetree@vger.kernel.org"},"content":"Now that there is documentation for the ds1307 and compatible RTCs, merge\nthe ds1339 documentation in it.\n\nSigned-off-by: Alexandre Belloni \n---\n .../devicetree/bindings/rtc/dallas,ds1339.txt | 18 ------------------\n Documentation/devicetree/bindings/rtc/rtc-ds1307.txt | 8 ++++++++\n 2 files changed, 8 insertions(+), 18 deletions(-)\n delete mode 100644 Documentation/devicetree/bindings/rtc/dallas,ds1339.txt","diff":"diff --git a/Documentation/devicetree/bindings/rtc/dallas,ds1339.txt b/Documentation/devicetree/bindings/rtc/dallas,ds1339.txt\ndeleted file mode 100644\nindex 916f57601a8f..000000000000\n--- a/Documentation/devicetree/bindings/rtc/dallas,ds1339.txt\n+++ /dev/null\n@@ -1,18 +0,0 @@\n-* Dallas DS1339\t\tI2C Serial Real-Time Clock\n-\n-Required properties:\n-- compatible: Should contain \"dallas,ds1339\".\n-- reg: I2C address for chip\n-\n-Optional properties:\n-- trickle-resistor-ohms : Selected resistor for trickle charger\n-\tValues usable for ds1339 are 250, 2000, 4000\n-\tShould be given if trickle charger should be enabled\n-- trickle-diode-disable : Do not use internal trickle charger diode\n-\tShould be given if internal trickle charger diode should be disabled\n-Example:\n-\tds1339: rtc@68 {\n-\t\tcompatible = \"dallas,ds1339\";\n-\t\ttrickle-resistor-ohms = <250>;\n-\t\treg = <0x68>;\n-\t};\ndiff --git a/Documentation/devicetree/bindings/rtc/rtc-ds1307.txt b/Documentation/devicetree/bindings/rtc/rtc-ds1307.txt\nindex c010f18a85a0..d28d6e7f6ae8 100644\n--- a/Documentation/devicetree/bindings/rtc/rtc-ds1307.txt\n+++ b/Documentation/devicetree/bindings/rtc/rtc-ds1307.txt\n@@ -26,6 +26,13 @@ Optional properties:\n - clock-output-names: From common clock binding to override the default output\n clock name\n - wakeup-source: Enables wake up of host system on alarm\n+- trickle-resistor-ohms : ds1339, ds1340 and ds 1388 only\n+\tSelected resistor for trickle charger\n+\tPossible values are 250, 2000, 4000\n+\tShould be given if trickle charger should be enabled\n+- trickle-diode-disable : ds1339, ds1340 and ds 1388 only\n+\tDo not use internal trickle charger diode\n+\tShould be given if internal trickle charger diode should be disabled\n \n Example:\n \trtc1: ds1339@68 {\n@@ -33,4 +40,5 @@ Example:\n \t\treg = <0x68>;\n \t\tinterrupt-parent = <&gpio4>;\n \t\tinterrupts = <20 0>;\n+\t\ttrickle-resistor-ohms = <250>;\n \t};\n","prefixes":["v2","6/6"]}