Skip to content

Commit

Permalink
Revert "ODROID-N1: rk3399-restart: Register with kernel restart handler"
Browse files Browse the repository at this point in the history
This reverts commit e7abf32.
  • Loading branch information
scpcom committed Aug 19, 2022
1 parent a527959 commit 3ba0917
Showing 1 changed file with 4 additions and 10 deletions.
14 changes: 4 additions & 10 deletions drivers/power/reset/rk3399-restart.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,10 @@ struct rk3399_restart {
};
struct rk3399_restart *rk3399_restart;

static int rk3399_reboot(struct notifier_block *nb, unsigned long action,
void *data)
static void rk3399_reboot(enum reboot_mode reboot_mode, const char *cmd)
{
if (IS_ERR(rk3399_restart->reset_gpio)) {
return NOTIFY_DONE;
return;
}
/* drive it active, also inactive->active edge */
gpiod_direction_output(rk3399_restart->reset_gpio, 1);
Expand All @@ -50,14 +49,9 @@ static int rk3399_reboot(struct notifier_block *nb, unsigned long action,

WARN_ON(1);

return NOTIFY_DONE;
return;
}

static struct notifier_block rk3399_reboot_nb = {
.notifier_call = rk3399_reboot,
.priority = 129,
};

static int rk3399_restart_probe(struct platform_device *pdev)
{
bool open_source = false;
Expand Down Expand Up @@ -89,7 +83,7 @@ static int rk3399_restart_probe(struct platform_device *pdev)

platform_set_drvdata(pdev, rk3399_restart);

register_restart_handler(&rk3399_reboot_nb);
arm_pm_restart = rk3399_reboot;

system_rev = 0x0301;

Expand Down

0 comments on commit 3ba0917

Please sign in to comment.