From: Sebastian Reichel <sebastian.reichel@collabora.com>
To: Sebastian Reichel <sre@kernel.org>,
Rob Herring <robh+dt@kernel.org>,
Emil Velikov <emil.velikov@collabora.com>
Cc: Linus Walleij <linus.walleij@linaro.org>,
Daniel Mack <daniel@zonque.org>,
Haojian Zhuang <haojian.zhuang@gmail.com>,
Robert Jarzmik <robert.jarzmik@free.fr>,
Russell King <linux@armlinux.org.uk>,
linux-pm@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, kernel@collabora.com,
linux-arm-kernel@lists.infradead.org,
Sebastian Reichel <sebastian.reichel@collabora.com>
Subject: [PATCHv2 6/6] power: supply: gpio-charger: drop legacy GPIO support
Date: Sat, 6 Jun 2020 00:44:03 +0200 [thread overview]
Message-ID: <20200605224403.181015-7-sebastian.reichel@collabora.com> (raw)
In-Reply-To: <20200605224403.181015-1-sebastian.reichel@collabora.com>
All board files have been converted to use boardfile GPIO
descriptor tables, so GPIO support can be removed from
platform data.
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
drivers/power/supply/gpio-charger.c | 30 +----------------------------
include/linux/power/gpio-charger.h | 5 -----
2 files changed, 1 insertion(+), 34 deletions(-)
diff --git a/drivers/power/supply/gpio-charger.c b/drivers/power/supply/gpio-charger.c
index 74fc664c01e3..8c9f69f3d13e 100644
--- a/drivers/power/supply/gpio-charger.c
+++ b/drivers/power/supply/gpio-charger.c
@@ -258,7 +258,6 @@ static int gpio_charger_probe(struct platform_device *pdev)
struct power_supply_desc *charger_desc;
struct gpio_desc *charge_status;
int charge_status_irq;
- unsigned long flags;
int ret;
int num_props = 0;
@@ -272,41 +271,14 @@ static int gpio_charger_probe(struct platform_device *pdev)
return -ENOMEM;
gpio_charger->dev = dev;
- /*
- * This will fetch a GPIO descriptor from device tree, ACPI or
- * boardfile descriptor tables. It's good to try this first.
- */
gpio_charger->gpiod = devm_gpiod_get_optional(dev, NULL, GPIOD_IN);
-
- /*
- * Fallback to legacy platform data method, if no GPIO is specified
- * using boardfile descriptor tables.
- */
- if (!gpio_charger->gpiod && pdata) {
- /* Non-DT: use legacy GPIO numbers */
- if (!gpio_is_valid(pdata->gpio)) {
- dev_err(dev, "Invalid gpio pin in pdata\n");
- return -EINVAL;
- }
- flags = GPIOF_IN;
- if (pdata->gpio_active_low)
- flags |= GPIOF_ACTIVE_LOW;
- ret = devm_gpio_request_one(dev, pdata->gpio, flags,
- dev_name(dev));
- if (ret) {
- dev_err(dev, "Failed to request gpio pin: %d\n", ret);
- return ret;
- }
- /* Then convert this to gpiod for now */
- gpio_charger->gpiod = gpio_to_desc(pdata->gpio);
- } else if (IS_ERR(gpio_charger->gpiod)) {
+ if (IS_ERR(gpio_charger->gpiod)) {
/* Just try again if this happens */
if (PTR_ERR(gpio_charger->gpiod) == -EPROBE_DEFER)
return -EPROBE_DEFER;
dev_err(dev, "error getting GPIO descriptor\n");
return PTR_ERR(gpio_charger->gpiod);
}
-
if (gpio_charger->gpiod) {
gpio_charger_properties[num_props] = POWER_SUPPLY_PROP_ONLINE;
num_props++;
diff --git a/include/linux/power/gpio-charger.h b/include/linux/power/gpio-charger.h
index 5a5a8de98181..3081391e93c9 100644
--- a/include/linux/power/gpio-charger.h
+++ b/include/linux/power/gpio-charger.h
@@ -13,8 +13,6 @@
* struct gpio_charger_platform_data - platform_data for gpio_charger devices
* @name: Name for the chargers power_supply device
* @type: Type of the charger
- * @gpio: GPIO which is used to indicate the chargers status
- * @gpio_active_low: Should be set to 1 if the GPIO is active low otherwise 0
* @supplied_to: Array of battery names to which this chargers supplies power
* @num_supplicants: Number of entries in the supplied_to array
*/
@@ -22,9 +20,6 @@ struct gpio_charger_platform_data {
const char *name;
enum power_supply_type type;
- int gpio;
- int gpio_active_low;
-
char **supplied_to;
size_t num_supplicants;
};
--
2.26.2
next prev parent reply other threads:[~2020-06-05 22:44 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-05 22:43 [PATCHv2 0/6] misc. gpio-charger patches Sebastian Reichel
2020-06-05 22:43 ` [PATCHv2 1/6] dt-bindings: power: supply: gpio-charger: convert to yaml Sebastian Reichel
2020-06-10 9:41 ` Linus Walleij
2020-06-15 17:49 ` Rob Herring
2020-06-19 16:29 ` Sebastian Reichel
2020-06-05 22:43 ` [PATCHv2 2/6] power: supply: gpio-charger: Make gpios optional Sebastian Reichel
2020-06-10 9:44 ` Linus Walleij
2020-06-15 17:50 ` Rob Herring
2020-06-19 16:29 ` Sebastian Reichel
2020-06-05 22:44 ` [PATCHv2 3/6] power: supply: gpio-charger: add charge-current-limit feature Sebastian Reichel
2020-06-10 9:46 ` Linus Walleij
2020-06-15 17:58 ` Rob Herring
2020-06-19 16:28 ` Sebastian Reichel
2020-06-05 22:44 ` [PATCHv2 4/6] ARM: pxa: Use GPIO descriptor for gpio-charger Sebastian Reichel
2020-06-10 9:52 ` Linus Walleij
2020-06-05 22:44 ` [PATCHv2 5/6] ARM: sa1100: " Sebastian Reichel
2020-06-10 9:54 ` Linus Walleij
2020-06-05 22:44 ` Sebastian Reichel [this message]
2020-06-10 9:55 ` [PATCHv2 6/6] power: supply: gpio-charger: drop legacy GPIO support Linus Walleij
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=20200605224403.181015-7-sebastian.reichel@collabora.com \
--to=sebastian.reichel@collabora.com \
--cc=daniel@zonque.org \
--cc=devicetree@vger.kernel.org \
--cc=emil.velikov@collabora.com \
--cc=haojian.zhuang@gmail.com \
--cc=kernel@collabora.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=robert.jarzmik@free.fr \
--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).