Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

of: property: fw_devlink: do not link ".*,nr-gpios"

[<vendor>,]nr-gpios property is used by some GPIO drivers[0] to indicate
the number of GPIOs present on a system, not define a GPIO. nr-gpios is
not configured by #gpio-cells and can't be parsed along with other
"*-gpios" properties.

nr-gpios without the "<vendor>," prefix is not allowed by the DT
spec[1], so only add exception for the ",nr-gpios" suffix and let the
error message continue being printed for non-compliant implementations.

[0] nr-gpios is referenced in Documentation/devicetree/bindings/gpio:
- gpio-adnp.txt
- gpio-xgene-sb.txt
- gpio-xlp.txt
- snps,dw-apb-gpio.yaml

[1] Link: https://github.com/devicetree-org/dt-schema/blob/cb53a16a1eb3e2169ce170c071e47940845ec26e/schemas/gpio/gpio-consumer.yaml#L20

Fixes errors such as:
OF: /palmbus@300000/gpio@600: could not find phandle

Fixes: 7f00be96f125 ("of: property: Add device link support for interrupt-parent, dmas and -gpio(s)")
Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Cc: Saravana Kannan <saravanak@google.com>
Cc: stable@vger.kernel.org # v5.5+
Link: https://lore.kernel.org/r/20210405222540.18145-1-ilya.lipnitskiy@gmail.com
Signed-off-by: Rob Herring <robh@kernel.org>

authored by

Ilya Lipnitskiy and committed by
Rob Herring
d473d32c 21d6ff39

+10 -1
+10 -1
drivers/of/property.c
··· 1260 1260 DEFINE_SIMPLE_PROP(pinctrl8, "pinctrl-8", NULL) 1261 1261 DEFINE_SUFFIX_PROP(regulators, "-supply", NULL) 1262 1262 DEFINE_SUFFIX_PROP(gpio, "-gpio", "#gpio-cells") 1263 - DEFINE_SUFFIX_PROP(gpios, "-gpios", "#gpio-cells") 1263 + 1264 + static struct device_node *parse_gpios(struct device_node *np, 1265 + const char *prop_name, int index) 1266 + { 1267 + if (!strcmp_suffix(prop_name, ",nr-gpios")) 1268 + return NULL; 1269 + 1270 + return parse_suffix_prop_cells(np, prop_name, index, "-gpios", 1271 + "#gpio-cells"); 1272 + } 1264 1273 1265 1274 static struct device_node *parse_iommu_maps(struct device_node *np, 1266 1275 const char *prop_name, int index)