Skip to content

Commit

Permalink
power: supply: sc27xx: Fix battery detect GPIO probe
Browse files Browse the repository at this point in the history
The DT bindings specify the property as 'battery-detect-gpios', add
handling for it. Keep fallback to the deprecated 'bat-detect-gpio' property
to keep compatibility with older DTS.

Signed-off-by: Stanislav Jakubek <stano.jakubek@gmail.com>
Link: https://lore.kernel.org/r/ca28b2f2037929c0011fc5c779c332c1d1ad5308.1730720720.git.stano.jakubek@gmail.com
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
  • Loading branch information
Stanislav Jakubek authored and Sebastian Reichel committed Nov 11, 2024
1 parent 2da0cb9 commit f29cc6d
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions drivers/power/supply/sc27xx_fuel_gauge.c
Original file line number Diff line number Diff line change
Expand Up @@ -1183,10 +1183,14 @@ static int sc27xx_fgu_probe(struct platform_device *pdev)
return PTR_ERR(data->charge_chan);
}

data->gpiod = devm_gpiod_get(dev, "bat-detect", GPIOD_IN);
data->gpiod = devm_gpiod_get(dev, "battery-detect", GPIOD_IN);
if (IS_ERR(data->gpiod)) {
dev_err(dev, "failed to get battery detection GPIO\n");
return PTR_ERR(data->gpiod);
data->gpiod = devm_gpiod_get(dev, "bat-detect", GPIOD_IN);
if (IS_ERR(data->gpiod)) {
dev_err(dev, "failed to get battery detection GPIO\n");
return PTR_ERR(data->gpiod);
}
dev_warn(dev, "bat-detect is deprecated, please use battery-detect\n");
}

ret = gpiod_get_value_cansleep(data->gpiod);
Expand Down

0 comments on commit f29cc6d

Please sign in to comment.