[merged] rtc-bq32000-add-trickle-charger-device-tree-binding.patch removed from -mm tree

[merged] rtc-bq32000-add-trickle-charger-device-tree-binding.patch removed from -mm tree

[akpm]

The patch titled
     Subject: rtc: bq32000: add trickle charger device tree binding
has been removed from the -mm tree.  Its filename was
     rtc-bq32000-add-trickle-charger-device-tree-binding.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Pavel Machek <pavel@ucw.cz>
Subject: rtc: bq32000: add trickle charger device tree binding

BQ32000 have "trickle chargers".  Introduce a device tree binding for
specifying the trickle charger configuration for that.

Signed-off-by: Pavel Machek <pavel@denx.de>
Reviewed-by: Jason Cooper <jason@lakedameon.net>
Cc: Matti Vaittinen <matti.vaittinen@nsn.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 Documentation/devicetree/bindings/i2c/ti,bq32k.txt |   18 +++++++++++
 1 file changed, 18 insertions(+)

diff -puN /dev/null Documentation/devicetree/bindings/i2c/ti,bq32k.txt
--- /dev/null
+++ a/Documentation/devicetree/bindings/i2c/ti,bq32k.txt
@@ -0,0 +1,18 @@
+* TI BQ32000                I2C Serial Real-Time Clock
+
+Required properties:
+- compatible: Should contain "ti,bq32000".
+- reg: I2C address for chip
+
+Optional properties:
+- trickle-resistor-ohms : Selected resistor for trickle charger
+       Values usable are 1120 and 20180
+       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:
+       bq32000: rtc@68 {
+               compatible = "ti,bq32000";
+               trickle-resistor-ohms = <1120>;
+               reg = <0x68>;
+       };
_

Patches currently in -mm which might be from pavel@ucw.cz are

origin.patch
input-route-kbd-leds-through-the-generic-leds-layer.patch
lib-vsprintf-add-%pt-format-specifier.patch
linux-next.patch

[patch] rtc: bq3000: fix register value

[Pavel Machek]

Fix register value in bq32000 trickle charging. 

Mike reported that I'm using wrong value in one trickle-charging case,
and after checking docs, I must admit he's right.
    
Signed-off-by: Pavel Machek <pavel@denx.de>
Reported-by: Mike Bremford <mike@bfo.com>

diff --git a/drivers/rtc/rtc-bq32k.c b/drivers/rtc/rtc-bq32k.c
index c02e246..54e9f7a 100644
--- a/drivers/rtc/rtc-bq32k.c
+++ b/drivers/rtc/rtc-bq32k.c
@@ -160,7 +160,7 @@ static int trickle_charger_of_init(struct device *dev, struct device_node *node)
 			dev_err(dev, "bq32k: diode and resistor mismatch\n");
 			return -EINVAL;
 		}
-		reg = 0x25;
+		reg = 0x45;
 		break;
 
 	default:

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html