mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 14:37:57 +00:00
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
|
From f55b35f2dbd1ab60fe8d59c56ae1cbad2f3e67ab Mon Sep 17 00:00:00 2001
|
||
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
||
|
|
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 <phil@raspberrypi.com>
|
||
|
|
---
|
||
|
|
drivers/gpio/gpio-fsm.c | 5 +++--
|
||
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/gpio/gpio-fsm.c
|
||
|
|
+++ b/drivers/gpio/gpio-fsm.c
|
||
|
|
@@ -866,8 +866,9 @@ static int gpio_fsm_probe(struct platfor
|
||
|
|
[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;
|
||
|
|
}
|
||
|
|
|