diff options
| author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2017-09-27 16:03:45 +0200 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2017-10-05 17:27:02 -0500 |
| commit | 1620c624305f3773563996757a87eecf44cecfec (patch) | |
| tree | 68b14e605b81bde6e9857e699a532e08d7c837f0 | |
| parent | 5015391d9d6e28c85fd98d663703497dd1ec7917 (diff) | |
| download | linux-stable-1620c624305f3773563996757a87eecf44cecfec.tar.gz linux-stable-1620c624305f3773563996757a87eecf44cecfec.tar.bz2 linux-stable-1620c624305f3773563996757a87eecf44cecfec.zip | |
dt-bindings: rtc: merge ds1339 in ds1307 documentation
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>
Signed-off-by: Rob Herring <robh@kernel.org>
| -rw-r--r-- | Documentation/devicetree/bindings/rtc/dallas,ds1339.txt | 18 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/rtc/rtc-ds1307.txt | 8 |
2 files changed, 8 insertions, 18 deletions
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>; }; |