From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
To: linux-rtc@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Rob Herring <robh+dt@kernel.org>,
devicetree@vger.kernel.org,
Alexandre Belloni <alexandre.belloni@free-electrons.com>
Subject: [PATCH v2 6/6] dt-bindings: rtc: merge ds1339 in ds1307 documentation
Date: Wed, 27 Sep 2017 16:03:45 +0200 [thread overview]
Message-ID: <20170927140345.5537-7-alexandre.belloni@free-electrons.com> (raw)
In-Reply-To: <20170927140345.5537-1-alexandre.belloni@free-electrons.com>
Now that there is documentation for the ds1307 and compatible RTCs, merge
the ds1339 documentation in it.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
.../devicetree/bindings/rtc/dallas,ds1339.txt | 18 ------------------
Documentation/devicetree/bindings/rtc/rtc-ds1307.txt | 8 ++++++++
2 files changed, 8 insertions(+), 18 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/rtc/dallas,ds1339.txt
diff --git a/Documentation/devicetree/bindings/rtc/dallas,ds1339.txt b/Documentation/devicetree/bindings/rtc/dallas,ds1339.txt
deleted file mode 100644
index 916f57601a8f..000000000000
--- a/Documentation/devicetree/bindings/rtc/dallas,ds1339.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-* Dallas DS1339 I2C Serial Real-Time Clock
-
-Required properties:
-- compatible: Should contain "dallas,ds1339".
-- reg: I2C address for chip
-
-Optional properties:
-- trickle-resistor-ohms : Selected resistor for trickle charger
- Values usable for ds1339 are 250, 2000, 4000
- Should be given if trickle charger should be enabled
-- trickle-diode-disable : Do not use internal trickle charger diode
- Should be given if internal trickle charger diode should be disabled
-Example:
- ds1339: rtc@68 {
- compatible = "dallas,ds1339";
- trickle-resistor-ohms = <250>;
- reg = <0x68>;
- };
diff --git a/Documentation/devicetree/bindings/rtc/rtc-ds1307.txt b/Documentation/devicetree/bindings/rtc/rtc-ds1307.txt
index c010f18a85a0..d28d6e7f6ae8 100644
--- a/Documentation/devicetree/bindings/rtc/rtc-ds1307.txt
+++ b/Documentation/devicetree/bindings/rtc/rtc-ds1307.txt
@@ -26,6 +26,13 @@ Optional properties:
- clock-output-names: From common clock binding to override the default output
clock name
- wakeup-source: Enables wake up of host system on alarm
+- trickle-resistor-ohms : ds1339, ds1340 and ds 1388 only
+ Selected resistor for trickle charger
+ Possible values are 250, 2000, 4000
+ Should be given if trickle charger should be enabled
+- trickle-diode-disable : ds1339, ds1340 and ds 1388 only
+ Do not use internal trickle charger diode
+ Should be given if internal trickle charger diode should be disabled
Example:
rtc1: ds1339@68 {
@@ -33,4 +40,5 @@ Example:
reg = <0x68>;
interrupt-parent = <&gpio4>;
interrupts = <20 0>;
+ trickle-resistor-ohms = <250>;
};
--
2.14.2
next prev parent reply other threads:[~2017-09-27 14:03 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-27 14:03 [PATCH v2 0/6] dt-bindings: rtc: document existing bindings Alexandre Belloni
2017-09-27 14:03 ` [PATCH v2 1/6] dt-bindings: trivial: Add RTCs Alexandre Belloni
2017-09-27 14:03 ` [PATCH v2 2/6] dt-bindings: rtc: add stericsson,coh901331 bindings Alexandre Belloni
[not found] ` <20170927140345.5537-1-alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2017-09-27 14:03 ` [PATCH v2 3/6] dt-bindings: rtc: Add sirf,prima2-sysrtc bindings Alexandre Belloni
2017-09-27 14:03 ` [PATCH v2 4/6] dt-bindings: rtc: DS1307 and compatibles are not trivial Alexandre Belloni
2017-09-27 14:03 ` [PATCH v2 5/6] dt-bindings: rtc: Add bindings for m41t80 and compatibles Alexandre Belloni
2017-09-27 14:03 ` Alexandre Belloni [this message]
2017-10-05 22:27 ` [PATCH v2 0/6] dt-bindings: rtc: document existing bindings Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170927140345.5537-7-alexandre.belloni@free-electrons.com \
--to=alexandre.belloni@free-electrons.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox