Skip to contentSkip to conversation

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

merged New [email protected] 2 participants 2 messages Oct 14, 2014 – Oct 22, 2014 Real time clock (RTC)

lore
Share & tools
lore

[email protected]

author tree notice Applied
#0 lore raw

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 <[email protected]>
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.

Cc Matti Vaittinen <[email protected]>
Cc Rob Herring <[email protected]>
Cc Ian Campbell <[email protected]>
Cc Alessandro Zummo <[email protected]>
Cc Guenter Roeck <[email protected]>

---

 Documentation/devicetree/bindings/i2c/ti,bq32k.txt |   18 +++++++++++
 1 file changed, 18 insertions(+)
Documentation/devicetree/bindings/i2c/ti,bq32k.txt new file +18 -0
diff -puN /dev/null 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 [email protected] are

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

#1 lore raw

PATCH 1/1 rtc: bq3000: fix register value

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.

drivers/rtc/rtc-bq32k.c +1 -1
index c02e246..54e9f7a 100644
@@ -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:
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html