Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

lib: utils: support both of gpio-poweroff, gpio-reset

Browse Source 
The generic GPIO reset driver has two entries in the match table:
"gpio-poweroff", "gpio-reset". Only the first entry is considered by
fdt_reset_init().

Define "gpio-poweroff" and "gpio-reset" as compatibility strings of two
separate reset drivers. They still can share code.

Fixes: e3d6919d10 ("lib: utils/reset: Add generic GPIO reset driver")
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
This commit is contained in:
Heinrich Schuchardt
2021-07-22 12:53:59 +02:00
committed by Anup Patel
parent ce03c88ee1
commit e928472e67
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/utils/reset/fdt_reset.c
View File

@@ -12,12 +12,14 @@
#include <sbi_utils/fdt/fdt_helper.h> #include <sbi_utils/fdt/fdt_helper.h>
#include <sbi_utils/reset/fdt_reset.h> #include <sbi_utils/reset/fdt_reset.h>
extern struct fdt_reset fdt_poweroff_gpio;
extern struct fdt_reset fdt_reset_gpio; extern struct fdt_reset fdt_reset_gpio;
extern struct fdt_reset fdt_reset_sifive_test; extern struct fdt_reset fdt_reset_sifive_test;
extern struct fdt_reset fdt_reset_htif; extern struct fdt_reset fdt_reset_htif;
extern struct fdt_reset fdt_reset_thead; extern struct fdt_reset fdt_reset_thead;
static struct fdt_reset *reset_drivers[] = { static struct fdt_reset *reset_drivers[] = {
&fdt_poweroff_gpio,
&fdt_reset_gpio, &fdt_reset_gpio,
&fdt_reset_sifive_test, &fdt_reset_sifive_test,
&fdt_reset_htif, &fdt_reset_htif,
@@ -45,7 +47,6 @@ int fdt_reset_init(void)
if (rc) if (rc)
return rc; return rc;
} }
break;
} }
return 0; return 0;

11
lib/utils/reset/fdt_reset_gpio.c
View File

@@ -129,8 +129,17 @@ static int gpio_reset_init(void *fdt, int nodeoff,
return 0; return 0;
} }
static const struct fdt_match gpio_reset_match[] = { static const struct fdt_match gpio_poweroff_match[] = {
{ .compatible = "gpio-poweroff", .data = (void *)FALSE }, { .compatible = "gpio-poweroff", .data = (void *)FALSE },
{ },
};
struct fdt_reset fdt_poweroff_gpio = {
.match_table = gpio_poweroff_match,
.init = gpio_reset_init,
};
static const struct fdt_match gpio_reset_match[] = {
{ .compatible = "gpio-restart", .data = (void *)TRUE }, { .compatible = "gpio-restart", .data = (void *)TRUE },
{ }, { },
}; };