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>

diff --git a/drivers/power/max8903_charger.c b/drivers/power/max8903_charger.c
index 0a5b0e142788dfc09ee1efb10430784867fe2707..6ec705f7a9d9d698327d2eff962daf1a37401ab6 100644 (file)
--- a/drivers/power/max8903_charger.c
+++ b/drivers/power/max8903_charger.c
@@ -211,27 +211,23 @@ static int max8903_probe(struct platform_device *pdev)
        }
 
        if (pdata->dc_valid) {
-               if (pdata->dok && gpio_is_valid(pdata->dok) &&
-                               pdata->dcm && gpio_is_valid(pdata->dcm)) {
+               if (pdata->dok && gpio_is_valid(pdata->dok)) {
                        gpio = pdata->dok; /* PULL_UPed Interrupt */
                        ta_in = gpio_get_value(gpio) ? 0 : 1;
+               } else {
+                       dev_err(dev, "When DC is wired, DOK should be wired as well.\n");
+                       return -EINVAL;
+               }
+       }
 
+       if (pdata->dcm) {
+               if (gpio_is_valid(pdata->dcm)) {
                        gpio = pdata->dcm; /* Output */
                        gpio_set_value(gpio, ta_in);
                } else {
-                       dev_err(dev, "When DC is wired, DOK and DCM should"
-                                       " be wired as well.\n");
+                       dev_err(dev, "Invalid pin: dcm.\n");
                        return -EINVAL;
                }
-       } else {
-               if (pdata->dcm) {
-                       if (gpio_is_valid(pdata->dcm))
-                               gpio_set_value(pdata->dcm, 0);
-                       else {
-                               dev_err(dev, "Invalid pin: dcm.\n");
-                               return -EINVAL;
-                       }
-               }
        }
 
        if (pdata->usb_valid) {

diff --git a/include/linux/power/max8903_charger.h b/include/linux/power/max8903_charger.h
index 24f51db8a83fa3d18f93f94bf082d2433ab1a316..89d3f1cb3433a40118c9740aea37995b2d4f0c92 100644 (file)
--- 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.
         */