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

lib: utils/gpio: Use FDT node offset as GPIO chip ID

Browse Source 
Since the FDT is not modified during driver initialization, node offsets
are just as suitable as phandles for use as identifiers: they are stable
and unique. With this change, it is no longer necessary to pass the
phandle to the driver init functions, so these init functions now use
the same prototype as other kinds of drivers.

This matches what is already done for I2C adapters.

Signed-off-by: Samuel Holland <samuel.holland@sifive.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
Samuel Holland
2024-09-03 19:09:38 -07:00
committed by Anup Patel
parent 598cf961d8
commit d71150ee70
5 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/utils/gpio/fdt_gpio.c
View File

@@ -16,17 +16,12 @@
extern struct fdt_gpio *fdt_gpio_drivers[];
extern unsigned long fdt_gpio_drivers_size;
static int fdt_gpio_init(const void *fdt, u32 phandle)
static int fdt_gpio_init(const void *fdt, int nodeoff)
{
int pos, nodeoff, rc;
int pos, rc;
struct fdt_gpio *drv;
const struct fdt_match *match;
/* Find node offset */
nodeoff = fdt_node_offset_by_phandle(fdt, phandle);
if (nodeoff < 0)
return nodeoff;
/* Check "gpio-controller" property */
if (!fdt_getprop(fdt, nodeoff, "gpio-controller", &rc))
return SBI_EINVAL;
@@ -37,7 +32,7 @@ static int fdt_gpio_init(const void *fdt, u32 phandle)
match = fdt_match_node(fdt, nodeoff, drv->match_table);
if (match && drv->init) {
rc = drv->init(fdt, nodeoff, phandle, match);
rc = drv->init(fdt, nodeoff, match);
if (rc == SBI_ENODEV)
continue;
if (rc)
@@ -49,20 +44,20 @@ static int fdt_gpio_init(const void *fdt, u32 phandle)
return SBI_ENOSYS;
}
static int fdt_gpio_chip_find(const void *fdt, u32 phandle,
static int fdt_gpio_chip_find(const void *fdt, int nodeoff,
struct gpio_chip **out_chip)
{
int rc;
struct gpio_chip *chip = gpio_chip_find(phandle);
struct gpio_chip *chip = gpio_chip_find(nodeoff);
if (!chip) {
/* GPIO chip not found so initialize matching driver */
rc = fdt_gpio_init(fdt, phandle);
rc = fdt_gpio_init(fdt, nodeoff);
if (rc)
return rc;
/* Try to find GPIO chip again */
chip = gpio_chip_find(phandle);
chip = gpio_chip_find(nodeoff);
if (!chip)
return SBI_ENOSYS;
}
@@ -77,7 +72,6 @@ int fdt_gpio_pin_get(const void *fdt, int nodeoff, int index,
struct gpio_pin *out_pin)
{
int rc;
u32 phandle;
struct fdt_gpio *drv;
struct gpio_chip *chip = NULL;
struct fdt_phandle_args pargs;
@@ -92,8 +86,7 @@ int fdt_gpio_pin_get(const void *fdt, int nodeoff, int index,
if (rc)
return rc;
phandle = fdt_get_phandle(fdt, pargs.node_offset);
rc = fdt_gpio_chip_find(fdt, phandle, &chip);
rc = fdt_gpio_chip_find(fdt, pargs.node_offset, &chip);
if (rc)
return rc;