From e3082dc555750d91e0d3e2237652ade5306b3347 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Sun, 22 Jan 2023 11:47:23 +0100 Subject: [PATCH] generic: backport fix for #nvmem-cell-cells false warning Recent backport of NVMEM layout support as well as acommpanying OF changes introduced a false #nvmem-cell-cells warning as #nvmem-cell-cells are fully optional. So, backport an upstream fix for this. Fixes: 11759a5bf3c6 ("kernel: backport of changes & helpers") Signed-off-by: Robert Marko --- ...roperty-fix-nvmem-cell-cells-parsing.patch | 44 +++++++++++++++++++ ...roperty-fix-nvmem-cell-cells-parsing.patch | 44 +++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 target/linux/generic/backport-5.10/828-v6.3-of-property-fix-nvmem-cell-cells-parsing.patch create mode 100644 target/linux/generic/backport-5.15/828-v6.3-of-property-fix-nvmem-cell-cells-parsing.patch diff --git a/target/linux/generic/backport-5.10/828-v6.3-of-property-fix-nvmem-cell-cells-parsing.patch b/target/linux/generic/backport-5.10/828-v6.3-of-property-fix-nvmem-cell-cells-parsing.patch new file mode 100644 index 0000000000..848ec3731b --- /dev/null +++ b/target/linux/generic/backport-5.10/828-v6.3-of-property-fix-nvmem-cell-cells-parsing.patch @@ -0,0 +1,44 @@ +From ef26c0349eb5a615dab2272d08d1d5de4ac9cd4c Mon Sep 17 00:00:00 2001 +From: Michael Walle +Date: Wed, 11 Jan 2023 00:30:56 +0100 +Subject: [PATCH] of: property: fix #nvmem-cell-cells parsing + +Commit 67b8497f005f ("of: property: make #.*-cells optional for simple +props") claims to make the cells-name property optional for simple +properties, but changed the code for the wrong property, i.e. for +DEFINE_SUFFIX_PROP(). Fix that. + +Fixes: 67b8497f005f ("of: property: make #.*-cells optional for simple props") +Reported-by: Peng Fan +Signed-off-by: Michael Walle +Acked-by: Rob Herring +Tested-by: Robert Marko +Signed-off-by: Srinivas Kandagatla +--- + drivers/of/property.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/drivers/of/property.c ++++ b/drivers/of/property.c +@@ -1213,8 +1213,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; +@@ -1267,8 +1267,8 @@ static struct device_node *parse_suffix_ + if (strcmp_suffix(prop_name, suffix)) + return NULL; + +- if (__of_parse_phandle_with_args(np, prop_name, cells_name, 0, index, +- &sup_args)) ++ if (of_parse_phandle_with_args(np, prop_name, cells_name, index, ++ &sup_args)) + return NULL; + + return sup_args.np; diff --git a/target/linux/generic/backport-5.15/828-v6.3-of-property-fix-nvmem-cell-cells-parsing.patch b/target/linux/generic/backport-5.15/828-v6.3-of-property-fix-nvmem-cell-cells-parsing.patch new file mode 100644 index 0000000000..f17cc1f4fa --- /dev/null +++ b/target/linux/generic/backport-5.15/828-v6.3-of-property-fix-nvmem-cell-cells-parsing.patch @@ -0,0 +1,44 @@ +From ef26c0349eb5a615dab2272d08d1d5de4ac9cd4c Mon Sep 17 00:00:00 2001 +From: Michael Walle +Date: Wed, 11 Jan 2023 00:30:56 +0100 +Subject: [PATCH] of: property: fix #nvmem-cell-cells parsing + +Commit 67b8497f005f ("of: property: make #.*-cells optional for simple +props") claims to make the cells-name property optional for simple +properties, but changed the code for the wrong property, i.e. for +DEFINE_SUFFIX_PROP(). Fix that. + +Fixes: 67b8497f005f ("of: property: make #.*-cells optional for simple props") +Reported-by: Peng Fan +Signed-off-by: Michael Walle +Acked-by: Rob Herring +Tested-by: Robert Marko +Signed-off-by: Srinivas Kandagatla +--- + drivers/of/property.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/drivers/of/property.c ++++ b/drivers/of/property.c +@@ -1173,8 +1173,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; +@@ -1227,8 +1227,8 @@ static struct device_node *parse_suffix_ + if (strcmp_suffix(prop_name, suffix)) + return NULL; + +- if (__of_parse_phandle_with_args(np, prop_name, cells_name, 0, index, +- &sup_args)) ++ if (of_parse_phandle_with_args(np, prop_name, cells_name, index, ++ &sup_args)) + return NULL; + + return sup_args.np; -- 2.30.2