33e72e0b3d
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.79 Manually rebased: ath79/patches-6.1/900-unaligned_access_hacks.patch All other patches automatically rebased. Build system: x86/64 Build-tested: x86/64/AMD Cezanne, ramips/tplink_archer-a6-v3, flogic/xiaomi_redmi-router-ax6000-ubootmod Run-tested: x86/64/AMD Cezanne, ramips/tplink_archer-a6-v3, flogic/xiaomi_redmi-router-ax6000-ubootmod Signed-off-by: John Audia <therealgraysky@proton.me>
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
From ff24fed10ba414d19579e26e60b126fad2f2bb07 Mon Sep 17 00:00:00 2001
|
|
From: Michael Walle <michael@walle.cc>
|
|
Date: Mon, 6 Feb 2023 13:43:44 +0000
|
|
Subject: [PATCH] of: property: make #.*-cells optional for simple props
|
|
|
|
Sometimes, future bindings for phandles will get additional arguments.
|
|
Thus the target node of the phandle will need a new #.*-cells property.
|
|
To be backwards compatible, this needs to be optional.
|
|
|
|
Prepare the DEFINE_SIMPLE_PROPS() to handle the cells name as optional.
|
|
|
|
Signed-off-by: Michael Walle <michael@walle.cc>
|
|
Tested-by: Miquel Raynal <miquel.raynal@bootlin.com>
|
|
Reviewed-by: Rob Herring <robh@kernel.org>
|
|
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
|
Link: https://lore.kernel.org/r/20230206134356.839737-11-srinivas.kandagatla@linaro.org
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/of/property.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/of/property.c
|
|
+++ b/drivers/of/property.c
|
|
@@ -1146,8 +1146,8 @@ static struct device_node *parse_prop_ce
|
|
if (strcmp(prop_name, list_name))
|
|
return NULL;
|
|
|
|
- if (of_parse_phandle_with_args(np, list_name, cells_name, index,
|
|
- &sup_args))
|
|
+ if (__of_parse_phandle_with_args(np, list_name, cells_name, 0, index,
|
|
+ &sup_args))
|
|
return NULL;
|
|
|
|
return sup_args.np;
|