From 1129cb7fbf38d774a5a0e8f7c672d7a4882d63db Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 15 Feb 2021 10:25:35 +0000 Subject: [PATCH] gpio-fsm: Rename 'num-soft-gpios' to avoid warning As of 5.10, the Device Tree parser warns about properties that look like references to "suppliers" of various services. "num-soft-gpios" resembles a declaration of a GPIO called "num-soft", causing the value to be interpreted as a phandle, the owner of which is checked for a "#gpio-cells" property. To avoid this warning, rename the gpio-fsm property to "num-swgpios". Signed-off-by: Phil Elwell --- drivers/gpio/gpio-fsm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/gpio-fsm.c b/drivers/gpio/gpio-fsm.c index 2cab50e..708f258 100644 --- a/drivers/gpio/gpio-fsm.c +++ b/drivers/gpio/gpio-fsm.c @@ -866,8 +866,9 @@ static int gpio_fsm_probe(struct platform_device *pdev) [SYM_SHUTDOWN] = "shutdown_state", }; - if (of_property_read_u32(np, "num-soft-gpios", &num_soft_gpios)) { - dev_err(dev, "missing 'num-soft-gpios' property\n"); + if (of_property_read_u32(np, "num-swgpios", &num_soft_gpios) && + of_property_read_u32(np, "num-soft-gpios", &num_soft_gpios)) { + dev_err(dev, "missing 'num-swgpios' property\n"); return -EINVAL; } -- 2.7.4