On 20/09/2017 at 15:52:20 -0500, Rob Herring wrote: > On Fri, Sep 15, 2017 at 03:45:51AM +0200, Alexandre Belloni wrote: > > Now that there is documentation for the ds1307 and compatible RTCs, merge > > the ds1339 documentation in it. > > > > Signed-off-by: Alexandre Belloni <[email protected]> > > --- > > .../devicetree/bindings/rtc/dallas,ds1339.txt | 18 > > ------------------ > > Documentation/devicetree/bindings/rtc/rtc-ds1307.txt | 6 ++++++ > > 2 files changed, 6 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 d1a820e25cb9..2eacc17a9b8d 100644 > > --- a/Documentation/devicetree/bindings/rtc/rtc-ds1307.txt > > +++ b/Documentation/devicetree/bindings/rtc/rtc-ds1307.txt > > @@ -26,6 +26,11 @@ 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 : 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 > > Do these apply to all compatibles or just 1339?
I'll send v2 shortly that is clearer about that. > > Rob -- Alexandre Belloni, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
