From: Chris Lapa <chris@lapa.com.au>
To: k.kozlowski@samsung.com, dwmw2@infradead.org,
dbaryshkov@gmail.com, sre@kernel.org, mark.rutland@arm.com,
robh+dt@kernel.org
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-pm@vger.kernel.org, Chris Lapa <chris@lapa.com.au>
Subject: [PATCH v4 4/7] max8903: adds requesting of gpios.
Date: Mon, 20 Jun 2016 08:27:19 +1000 [thread overview]
Message-ID: <1466375242-38354-5-git-send-email-chris@cpdesign.com.au> (raw)
In-Reply-To: <1466375242-38354-1-git-send-email-chris@cpdesign.com.au>
In-Reply-To: <1464849897-21527-3-git-send-email-chris@lapa.com.au>
From: Chris Lapa <chris@lapa.com.au>
This change ensures all gpios are available for the driver to use and also
splits off gpio setup into its own function for readability.
Signed-off-by: Chris Lapa <chris@lapa.com.au>
---
drivers/power/max8903_charger.c | 136 ++++++++++++++++++++++++++++++----------
1 file changed, 102 insertions(+), 34 deletions(-)
diff --git a/drivers/power/max8903_charger.c b/drivers/power/max8903_charger.c
index 6ec705f..3f35593 100644
--- a/drivers/power/max8903_charger.c
+++ b/drivers/power/max8903_charger.c
@@ -179,39 +179,27 @@ static irqreturn_t max8903_fault(int irq, void *_data)
return IRQ_HANDLED;
}
-static int max8903_probe(struct platform_device *pdev)
+static int max8903_setup_gpios(struct platform_device *pdev)
{
- struct max8903_data *data;
+ struct max8903_data *data = platform_get_drvdata(pdev);
struct device *dev = &pdev->dev;
struct max8903_pdata *pdata = pdev->dev.platform_data;
- struct power_supply_config psy_cfg = {};
int ret = 0;
int gpio;
int ta_in = 0;
int usb_in = 0;
- if (pdata == NULL) {
- dev_err(dev, "No platform data.\n");
- return -EINVAL;
- }
-
- data = devm_kzalloc(dev, sizeof(struct max8903_data), GFP_KERNEL);
- if (data == NULL) {
- dev_err(dev, "Cannot allocate memory.\n");
- return -ENOMEM;
- }
-
- data->pdata = pdev->dev.platform_data;
- data->dev = dev;
- platform_set_drvdata(pdev, data);
-
- if (pdata->dc_valid == false && pdata->usb_valid == false) {
- dev_err(dev, "No valid power sources.\n");
- return -EINVAL;
- }
-
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 ret;
+ }
+
gpio = pdata->dok; /* PULL_UPed Interrupt */
ta_in = gpio_get_value(gpio) ? 0 : 1;
} else {
@@ -222,6 +210,15 @@ 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 ret;
+ }
+
gpio = pdata->dcm; /* Output */
gpio_set_value(gpio, ta_in);
} else {
@@ -232,6 +229,15 @@ 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 ret;
+ }
+
gpio = pdata->uok;
usb_in = gpio_get_value(gpio) ? 0 : 1;
} else {
@@ -243,6 +249,15 @@ 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 ret;
+ }
+
gpio_set_value(pdata->cen, (ta_in || usb_in) ? 0 : 1);
} else {
dev_err(dev, "Invalid pin: cen.\n");
@@ -251,23 +266,41 @@ 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 ret;
+ }
}
}
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 ret;
+ }
}
}
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 ret;
+ }
}
}
@@ -275,9 +308,44 @@ static int max8903_probe(struct platform_device *pdev)
data->ta_in = ta_in;
data->usb_in = usb_in;
+ return 0;
+}
+
+static int max8903_probe(struct platform_device *pdev)
+{
+ struct max8903_data *data;
+ struct device *dev = &pdev->dev;
+ struct max8903_pdata *pdata = pdev->dev.platform_data;
+ struct power_supply_config psy_cfg = {};
+ int ret = 0;
+
+ if (pdata == NULL) {
+ dev_err(dev, "No platform data.\n");
+ return -EINVAL;
+ }
+
+ data = devm_kzalloc(dev, sizeof(struct max8903_data), GFP_KERNEL);
+ if (data == NULL) {
+ dev_err(dev, "Cannot allocate memory.\n");
+ return -ENOMEM;
+ }
+
+ data->pdata = pdev->dev.platform_data;
+ data->dev = dev;
+ platform_set_drvdata(pdev, data);
+
+ if (pdata->dc_valid == false && pdata->usb_valid == false) {
+ dev_err(dev, "No valid power sources.\n");
+ return -EINVAL;
+ }
+
+ ret = max8903_setup_gpios(pdev);
+ if (ret)
+ return ret;
+
data->psy_desc.name = "max8903_charger";
- data->psy_desc.type = (ta_in) ? POWER_SUPPLY_TYPE_MAINS :
- ((usb_in) ? POWER_SUPPLY_TYPE_USB :
+ data->psy_desc.type = (data->ta_in) ? POWER_SUPPLY_TYPE_MAINS :
+ ((data->usb_in) ? POWER_SUPPLY_TYPE_USB :
POWER_SUPPLY_TYPE_BATTERY);
data->psy_desc.get_property = max8903_get_property;
data->psy_desc.properties = max8903_charger_props;
--
1.9.1
next prev parent reply other threads:[~2016-06-20 7:24 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-02 6:44 [PATCH 0/2] max8903: Add device tree support and logic fixup chris
2016-06-02 6:44 ` [PATCH 1/2] max8903: adds support for initiation via device tree chris
2016-06-09 10:35 ` Krzysztof Kozlowski
2016-06-10 5:35 ` Chris Lapa
2016-06-10 6:13 ` Krzysztof Kozlowski
2016-06-10 10:23 ` Krzysztof Kozlowski
2016-06-02 6:44 ` [PATCH 2/2] max8903: cleans up confusing relationship between dc_valid, dok and dcm chris
2016-06-10 12:32 ` [PATCH v2 0/4] max8903: Add device tree support and logic fixup Chris Lapa
2016-06-10 12:32 ` [PATCH v2 1/4] max8903: adds documentation for device tree bindings Chris Lapa
2016-06-10 13:51 ` Krzysztof Kozlowski
2016-06-14 1:54 ` Chris Lapa
2016-06-16 6:35 ` Krzysztof Kozlowski
2016-06-16 6:48 ` Chris Lapa
2016-06-10 12:32 ` [PATCH v2 2/4] max8903: adds support for initiation via device tree Chris Lapa
2016-06-10 14:02 ` Krzysztof Kozlowski
2016-06-14 1:50 ` Chris Lapa
2016-06-10 12:32 ` [PATCH v2 3/4] max8903: cleans up confusing relationship between dc_valid, dok and dcm Chris Lapa
2016-06-10 12:32 ` [PATCH v2 4/4] max8903: remove unnecessary malloc failed message print out Chris Lapa
2016-06-10 14:08 ` Krzysztof Kozlowski
2016-06-17 5:00 ` [PATCH v3 0/7] max8903: Add device tree support and misc fixes Chris Lapa
2016-06-17 5:00 ` [PATCH v3 1/7] max8903: adds documentation for device tree bindings Chris Lapa
2016-06-17 6:15 ` Krzysztof Kozlowski
2016-06-20 13:22 ` Rob Herring
2016-06-20 23:43 ` Chris Lapa
2016-06-17 5:00 ` [PATCH v3 2/7] max8903: store pointer to pdata instead of copying it Chris Lapa
2016-06-17 6:14 ` Krzysztof Kozlowski
2016-06-17 5:00 ` [PATCH v3 3/7] max8903: cleans up confusing relationship between dc_valid, dok and dcm Chris Lapa
2016-06-17 6:23 ` Krzysztof Kozlowski
2016-06-17 6:26 ` Krzysztof Kozlowski
2016-06-17 6:28 ` Chris Lapa
2016-06-17 6:42 ` Krzysztof Kozlowski
2016-06-19 13:48 ` Chris Lapa
2016-06-17 5:00 ` [PATCH v3 4/7] max8903: adds requesting of gpios Chris Lapa
2016-06-17 6:30 ` Krzysztof Kozlowski
2016-06-19 13:51 ` Chris Lapa
2016-06-17 5:00 ` [PATCH v3 5/7] max8903: removes non zero validity checks on gpios Chris Lapa
2016-06-17 6:35 ` Krzysztof Kozlowski
2016-06-17 5:00 ` [PATCH v3 6/7] max8903: remove unnecessary 'out of memory' error message Chris Lapa
2016-06-17 6:35 ` Krzysztof Kozlowski
2016-06-17 5:00 ` [PATCH v3 7/7] max8903: adds support for initiation via device tree Chris Lapa
2016-06-17 6:41 ` Krzysztof Kozlowski
2016-06-19 13:52 ` Chris Lapa
2016-06-19 22:27 ` [PATCH v4 0/7] max8903: Add device tree support and misc fixes Chris Lapa
2016-06-19 22:27 ` [PATCH v4 1/7] max8903: adds documentation for device tree bindings Chris Lapa
2016-06-20 12:17 ` Krzysztof Kozlowski
2016-06-19 22:27 ` [PATCH v4 2/7] max8903: store pointer to pdata instead of copying it Chris Lapa
2016-06-20 12:18 ` Krzysztof Kozlowski
2016-06-19 22:27 ` [PATCH v4 3/7] max8903: cleans up confusing relationship between dc_valid, dok and dcm Chris Lapa
2016-06-20 12:18 ` Krzysztof Kozlowski
2016-06-19 22:27 ` Chris Lapa [this message]
2016-06-20 12:20 ` [PATCH v4 4/7] max8903: adds requesting of gpios Krzysztof Kozlowski
2016-06-19 22:27 ` [PATCH v4 5/7] max8903: removes non zero validity checks on gpios Chris Lapa
2016-06-20 12:21 ` Krzysztof Kozlowski
2016-06-19 22:27 ` [PATCH v4 6/7] max8903: remove unnecessary 'out of memory' error message Chris Lapa
2016-06-20 12:22 ` Krzysztof Kozlowski
2016-06-19 22:27 ` [PATCH v4 7/7] max8903: adds support for initiation via device tree Chris Lapa
2016-06-20 12:23 ` Krzysztof Kozlowski
2016-06-24 2:26 ` [PATCH v5 0/7] max8903: Add device tree support and misc fixes Chris Lapa
2016-06-24 2:26 ` [PATCH v5 1/7] max8903: adds documentation for device tree bindings Chris Lapa
2016-06-28 20:55 ` Rob Herring
2016-06-24 2:26 ` [PATCH v5 2/7] max8903: store pointer to pdata instead of copying it Chris Lapa
2016-06-24 2:26 ` [PATCH v5 3/7] max8903: cleans up confusing relationship between dc_valid, dok and dcm Chris Lapa
2016-06-24 2:26 ` [PATCH v5 4/7] max8903: adds requesting of gpios Chris Lapa
2016-06-24 2:26 ` [PATCH v5 5/7] max8903: removes non zero validity checks on gpios Chris Lapa
2016-06-24 2:26 ` [PATCH v5 6/7] max8903: remove unnecessary 'out of memory' error message Chris Lapa
2016-06-24 2:26 ` [PATCH v5 7/7] max8903: adds support for initiation via device tree Chris Lapa
2016-06-28 18:16 ` [PATCH v5 0/7] max8903: Add device tree support and misc fixes Sebastian Reichel
2016-06-28 23:05 ` Chris Lapa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1466375242-38354-5-git-send-email-chris@cpdesign.com.au \
--to=chris@lapa.com.au \
--cc=dbaryshkov@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=dwmw2@infradead.org \
--cc=k.kozlowski@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=sre@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).