Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1424644
| From | Chris Lapa <chris@lapa.com.au> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v3 4/7] max8903: adds requesting of gpios. |
| Date | 2016-06-17 07:10 +0200 |
| Message-ID | <rKUcx-2fy-13@gated-at.bofh.it> (permalink) |
| References | <rFuC5-2sz-13@gated-at.bofh.it> <rKUcx-2fy-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Chris Lapa <chris@lapa.com.au>
This change ensures all gpios are available for the driver to use.
Signed-off-by: Chris Lapa <chris@lapa.com.au>
---
drivers/power/max8903_charger.c | 79 ++++++++++++++++++++++++++++++++++++-----
1 file changed, 70 insertions(+), 9 deletions(-)
diff --git a/drivers/power/max8903_charger.c b/drivers/power/max8903_charger.c
index dbd911c4..c068efe 100644
--- a/drivers/power/max8903_charger.c
+++ b/drivers/power/max8903_charger.c
@@ -212,6 +212,16 @@ static int max8903_probe(struct platform_device *pdev)
if (pdata->dc_valid) {
if (pdata->dok && gpio_is_valid(pdata->dok)) {
+ ret = devm_gpio_request(dev,
+ pdata->dok,
+ data->psy_desc.name);
+ if (ret) {
+ dev_err(dev,
+ "Failed GPIO request for dok: %d err %d\n",
+ pdata->dok, ret);
+ return -EINVAL;
+ }
+
gpio = pdata->dok; /* PULL_UPed Interrupt */
ta_in = gpio_get_value(gpio) ? 0 : 1;
} else {
@@ -223,6 +233,16 @@ static int max8903_probe(struct platform_device *pdev)
if (pdata->dcm) {
if (gpio_is_valid(pdata->dcm)) {
+ ret = devm_gpio_request(dev,
+ pdata->dcm,
+ data->psy_desc.name);
+ if (ret) {
+ dev_err(dev,
+ "Failed GPIO request for dcm: %d err %d\n",
+ pdata->dcm, ret);
+ return -EINVAL;
+ }
+
gpio = pdata->dcm; /* Output */
gpio_set_value(gpio, ta_in);
} else {
@@ -233,6 +253,16 @@ static int max8903_probe(struct platform_device *pdev)
if (pdata->usb_valid) {
if (pdata->uok && gpio_is_valid(pdata->uok)) {
+ ret = devm_gpio_request(dev,
+ pdata->uok,
+ data->psy_desc.name);
+ if (ret) {
+ dev_err(dev,
+ "Failed GPIO request for uok: %d err %d\n",
+ pdata->uok, ret);
+ return -EINVAL;
+ }
+
gpio = pdata->uok;
usb_in = gpio_get_value(gpio) ? 0 : 1;
} else {
@@ -244,6 +274,16 @@ static int max8903_probe(struct platform_device *pdev)
if (pdata->cen) {
if (gpio_is_valid(pdata->cen)) {
+ ret = devm_gpio_request(dev,
+ pdata->cen,
+ data->psy_desc.name);
+ if (ret) {
+ dev_err(dev,
+ "Failed GPIO request for cen: %d err %d\n",
+ pdata->cen, ret);
+ return -EINVAL;
+ }
+
gpio_set_value(pdata->cen, (ta_in || usb_in) ? 0 : 1);
} else {
dev_err(dev, "Invalid pin: cen.\n");
@@ -252,23 +292,44 @@ static int max8903_probe(struct platform_device *pdev)
}
if (pdata->chg) {
- if (!gpio_is_valid(pdata->chg)) {
- dev_err(dev, "Invalid pin: chg.\n");
- return -EINVAL;
+ if (gpio_is_valid(pdata->chg)) {
+ ret = devm_gpio_request(dev,
+ pdata->chg,
+ data->psy_desc.name);
+ if (ret) {
+ dev_err(dev,
+ "Failed GPIO request for chg: %d err %d\n",
+ pdata->chg, ret);
+ return -EINVAL;
+ }
}
}
if (pdata->flt) {
- if (!gpio_is_valid(pdata->flt)) {
- dev_err(dev, "Invalid pin: flt.\n");
- return -EINVAL;
+ if (gpio_is_valid(pdata->flt)) {
+ ret = devm_gpio_request(dev,
+ pdata->flt,
+ data->psy_desc.name);
+ if (ret) {
+ dev_err(dev,
+ "Failed GPIO request for flt: %d err %d\n",
+ pdata->flt, ret);
+ return -EINVAL;
+ }
}
}
if (pdata->usus) {
- if (!gpio_is_valid(pdata->usus)) {
- dev_err(dev, "Invalid pin: usus.\n");
- return -EINVAL;
+ if (gpio_is_valid(pdata->usus)) {
+ ret = devm_gpio_request(dev,
+ pdata->usus,
+ data->psy_desc.name);
+ if (ret) {
+ dev_err(dev,
+ "Failed GPIO request for usus: %d err %d\n",
+ pdata->usus, ret);
+ return -EINVAL;
+ }
}
}
--
1.9.1
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
[PATCH v3 4/7] max8903: adds requesting of gpios. Chris Lapa <chris@lapa.com.au> - 2016-06-17 07:10 +0200
Re: [PATCH v3 4/7] max8903: adds requesting of gpios. Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2016-06-17 08:40 +0200
Re: [PATCH v3 4/7] max8903: adds requesting of gpios. Chris Lapa <chris@lapa.com.au> - 2016-06-19 16:00 +0200
csiph-web