UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mfd: axp20x: Switch to the sys-off handler API 

This removes a layer of indirection through pm_power_off() and allows
the PMIC handler to be used as a fallback when firmware power off fails.
This happens on boards like the Clockwork DevTerm R-01 where OpenSBI
does not know how to use the PMIC to power off the board.

Move the check for AXP288 to avoid registering a dummy handler.

Signed-off-by: Samuel Holland <samuel@sholland.org>
[Lee: Removed superfluous new line]
Signed-off-by: Lee Jones <lee@kernel.org>
Link: https://lore.kernel.org/r/20221228162752.14204-1-samuel@sholland.org
This commit is contained in:
Samuel Holland 2022-12-28 10:27:52 -06:00 committed by Lee Jones
parent 88a32c2c5e
commit 1b1305e95e
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/mfd/axp20x.c
View File

@ -23,7 +23,7 @@
#include <linux/mfd/core.h> #include <linux/mfd/core.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/pm_runtime.h> #include <linux/reboot.h>
#include <linux/regmap.h> #include <linux/regmap.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
@ -825,17 +825,16 @@ static const struct mfd_cell axp813_cells[] = {
}, },
}; };
static struct axp20x_dev *axp20x_pm_power_off; static int axp20x_power_off(struct sys_off_data *data)
static void axp20x_power_off(void)
{ {
if (axp20x_pm_power_off->variant == AXP288_ID) struct axp20x_dev *axp20x = data->cb_data;
return;
regmap_write(axp20x_pm_power_off->regmap, AXP20X_OFF_CTRL, regmap_write(axp20x->regmap, AXP20X_OFF_CTRL, AXP20X_OFF);
AXP20X_OFF);
/* Give capacitors etc. time to drain to avoid kernel panic msg. */ /* Give capacitors etc. time to drain to avoid kernel panic msg. */
mdelay(500); mdelay(500);
return NOTIFY_DONE;
} }
int axp20x_match_device(struct axp20x_dev *axp20x) int axp20x_match_device(struct axp20x_dev *axp20x)
@ -1002,10 +1001,11 @@ int axp20x_device_probe(struct axp20x_dev *axp20x)
return ret; return ret;
} }
if (!pm_power_off) { if (axp20x->variant != AXP288_ID)
axp20x_pm_power_off = axp20x; devm_register_sys_off_handler(axp20x->dev,
pm_power_off = axp20x_power_off; SYS_OFF_MODE_POWER_OFF,
} SYS_OFF_PRIO_DEFAULT,
axp20x_power_off, axp20x);
dev_info(axp20x->dev, "AXP20X driver loaded\n"); dev_info(axp20x->dev, "AXP20X driver loaded\n");
@ -1015,11 +1015,6 @@ EXPORT_SYMBOL(axp20x_device_probe);
void axp20x_device_remove(struct axp20x_dev *axp20x) void axp20x_device_remove(struct axp20x_dev *axp20x)
{ {
if (axp20x == axp20x_pm_power_off) {
axp20x_pm_power_off = NULL;
pm_power_off = NULL;
}
mfd_remove_devices(axp20x->dev); mfd_remove_devices(axp20x->dev);
regmap_del_irq_chip(axp20x->irq, axp20x->regmap_irqc); regmap_del_irq_chip(axp20x->irq, axp20x->regmap_irqc);
} }