hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

power: supply: gpio-charger: Use GPIOF_ACTIVE_LOW for legacy setup 

Setting GPIOF_ACTIVE_LOW flag based on platform data gpio_active_low
makes return value of gpiod_get_value_cansleep directly usable.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
This commit is contained in:
Ladislav Michl 2018-03-05 19:05:18 +01:00 committed by Sebastian Reichel
parent d433d04bb7
commit f5fec4cc29
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/power/supply/gpio-charger.c
View File

@ -55,13 +55,10 @@ static int gpio_charger_get_property(struct power_supply *psy,
enum power_supply_property psp, union power_supply_propval *val) enum power_supply_property psp, union power_supply_propval *val)
{ {
struct gpio_charger *gpio_charger = psy_to_gpio_charger(psy); struct gpio_charger *gpio_charger = psy_to_gpio_charger(psy);
const struct gpio_charger_platform_data *pdata = gpio_charger->pdata;
switch (psp) { switch (psp) {
case POWER_SUPPLY_PROP_ONLINE: case POWER_SUPPLY_PROP_ONLINE:
val->intval = gpiod_get_value_cansleep(gpio_charger->gpiod); val->intval = gpiod_get_value_cansleep(gpio_charger->gpiod);
/* This xor is only ever used with legacy pdata GPIO */
val->intval ^= pdata->gpio_active_low;
break; break;
default: default:
return -EINVAL; return -EINVAL;
@ -123,8 +120,8 @@ static int gpio_charger_probe(struct platform_device *pdev)
struct power_supply_config psy_cfg = {}; struct power_supply_config psy_cfg = {};
struct gpio_charger *gpio_charger; struct gpio_charger *gpio_charger;
struct power_supply_desc *charger_desc; struct power_supply_desc *charger_desc;
int ret; unsigned long flags;
int irq; int irq, ret;
if (!pdata) { if (!pdata) {
pdata = gpio_charger_parse_dt(dev); pdata = gpio_charger_parse_dt(dev);
@ -156,11 +153,13 @@ static int gpio_charger_probe(struct platform_device *pdev)
dev_err(dev, "Invalid gpio pin in pdata\n"); dev_err(dev, "Invalid gpio pin in pdata\n");
return -EINVAL; return -EINVAL;
} }
ret = devm_gpio_request_one(dev, pdata->gpio, GPIOF_IN, flags = GPIOF_IN;
dev_name(dev)); if (pdata->gpio_active_low)
flags |= GPIOF_ACTIVE_LOW;
ret = devm_gpio_request_one(dev, pdata->gpio, flags,
dev_name(dev));
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to request gpio pin: %d\n", dev_err(dev, "Failed to request gpio pin: %d\n", ret);
ret);
return ret; return ret;
} }
/* Then convert this to gpiod for now */ /* Then convert this to gpiod for now */