The patch titled
Subject: Documentation: dt-bindings: trickle charger dt binding document for ds1339
has been added to the -mm tree. Its filename is
documentation-dt-bindings-trickle-charger-dt-binding-document-for-ds1339.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/documentation-dt-bindings-trickle-charger-dt-binding-document-for-ds1339.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/documentation-dt-bindings-trickle-charger-dt-binding-document-for-ds1339.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Matti Vaittinen <matti.vaittinen@xxxxxxx>
Subject: Documentation: dt-bindings: trickle charger dt binding document for ds1339
Some DS13XX devices have "trickle chargers". Introduce a device tree
binding for the resistor and diode configuration for enabling trickle
charger.
Signed-off-by: Matti Vaittinen <matti.vaittinen@xxxxxxx>
Acked-by: Jason Cooper <jason@xxxxxxxxxxxxxx>
Cc: Rob Herring <robh+dt@xxxxxxxxxx>
Cc: Pawel Moll <pawel.moll@xxxxxxx>
Cc: Guenter Roeck <linux@xxxxxxxxxxxx>
Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Cc: Mark Rutland <mark.rutland@xxxxxxx>
Cc: Pavel Machek <pavel@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
Documentation/devicetree/bindings/i2c/trivial-devices.txt | 1
Documentation/devicetree/bindings/rtc/dallas,ds1339.txt | 18 ++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
diff -puN Documentation/devicetree/bindings/i2c/trivial-devices.txt~documentation-dt-bindings-trickle-charger-dt-binding-document-for-ds1339 Documentation/devicetree/bindings/i2c/trivial-devices.txt
--- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt~documentation-dt-bindings-trickle-charger-dt-binding-document-for-ds1339
+++ a/Documentation/devicetree/bindings/i2c/trivial-devices.txt
@@ -35,7 +35,6 @@ catalyst,24c32 i2c serial eeprom
cirrus,cs42l51 Cirrus Logic CS42L51 audio codec
dallas,ds1307 64 x 8, Serial, I2C Real-Time Clock
dallas,ds1338 I2C RTC with 56-Byte NV RAM
-dallas,ds1339 I2C Serial Real-Time Clock
dallas,ds1340 I2C RTC with Trickle Charger
dallas,ds1374 I2C, 32-Bit Binary Counter Watchdog RTC with Trickle Charger and Reset Input/Output
dallas,ds1631 High-Precision Digital Thermometer
diff -puN /dev/null Documentation/devicetree/bindings/rtc/dallas,ds1339.txt
--- /dev/null
+++ a/Documentation/devicetree/bindings/rtc/dallas,ds1339.txt
@@ -0,0 +1,18 @@
+* 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>;
+ };
_
Patches currently in -mm which might be from matti.vaittinen@xxxxxxx are
documentation-dt-bindings-trickle-charger-dt-binding-document-for-ds1339.patch
rtc-ds1307-add-trickle-charger-device-tree-binding.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
