summaryrefslogtreecommitdiffstats
path: root/include/linux/power
diff options
context:
space:
mode:
authorChris Lapa <chris@lapa.com.au>2016-06-24 12:26:08 +1000
committerSebastian Reichel <sre@kernel.org>2016-06-28 20:05:41 +0200
commitcbf9077e586b9c0db1a1ce5690552ae268c15848 (patch)
tree04a3c100d0f13dfcee5e9105349ff6d079a506b8 /include/linux/power
parent0c3ae04b00f5664b98435b072c1694e62a823e5a (diff)
downloadblackbird-op-linux-cbf9077e586b9c0db1a1ce5690552ae268c15848.tar.gz
blackbird-op-linux-cbf9077e586b9c0db1a1ce5690552ae268c15848.zip
max8903: cleans up confusing relationship between dc_valid, dok and dcm.
The max8903_charger.h file indicated that dcm and dok were not optional when dc_valid is set. It makes sense to have dok as a compulsory pin when dc_valid is given. However dcm can be optionally wired to a fixed level especially when the circuit is configured for dc power exclusively. The previous implementation already allowed for this somewhat, however no error was given if dok wasn't given whilst dc_valid was. The new implementation enforces dok presence when dc_valid is given. Whilst allowing dcm to be optional. Signed-off-by: Chris Lapa <chris@lapa.com.au> Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'include/linux/power')
-rw-r--r--include/linux/power/max8903_charger.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/power/max8903_charger.h b/include/linux/power/max8903_charger.h
index 24f51db8a83f..89d3f1cb3433 100644
--- a/include/linux/power/max8903_charger.h
+++ b/include/linux/power/max8903_charger.h
@@ -26,8 +26,8 @@
struct max8903_pdata {
/*
* GPIOs
- * cen, chg, flt, and usus are optional.
- * dok, dcm, and uok are not optional depending on the status of
+ * cen, chg, flt, dcm and usus are optional.
+ * dok and uok are not optional depending on the status of
* dc_valid and usb_valid.
*/
int cen; /* Charger Enable input */
@@ -41,7 +41,7 @@ struct max8903_pdata {
/*
* DC(Adapter/TA) is wired
* When dc_valid is true,
- * dok and dcm should be valid.
+ * dok should be valid.
*
* At least one of dc_valid or usb_valid should be true.
*/
OpenPOWER on IntegriCloud