| Message ID | 20210120073310.427462-1-saravanak@google.com |
|---|---|
| State | Rejected |
| Headers | show |
| Series | [v2] of: property: Add fw_devlink support for "gpio" and "gpios" binding | expand |
On Tue, Jan 19, 2021 at 11:33 PM Saravana Kannan <saravanak@google.com> wrote: > > To provide backward compatibility for boards that use deprecated DT > bindings, we need to add fw_devlink support for "gpio" and "gpios". > > Cc: linux-tegra <linux-tegra@vger.kernel.org> > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: Geert Uytterhoeven <geert@linux-m68k.org> > Fixes: e590474768f1 ("driver core: Set fw_devlink=on by default") > Tested-by: Jon Hunter <jonathanh@nvidia.com> > Signed-off-by: Saravana Kannan <saravanak@google.com> > --- > Greg/Rob, > > I think it's better for this to go into driver-core-next because this > fixed fw_devlink=on change that's queued for 5.12-rcX. > > -Saravana > > drivers/of/property.c | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) > > diff --git a/drivers/of/property.c b/drivers/of/property.c > index 5f9eed79a8aa..0b256ce9d7d5 100644 > --- a/drivers/of/property.c > +++ b/drivers/of/property.c > @@ -1271,6 +1271,24 @@ static struct device_node *parse_iommu_maps(struct device_node *np, > return of_parse_phandle(np, prop_name, (index * 4) + 1); > } > > +static struct device_node *parse_gpio_compat(struct device_node *np, > + const char *prop_name, int index) > +{ > + struct of_phandle_args sup_args; > + > + if (strcmp(prop_name, "gpio") && strcmp(prop_name, "gpios")) > + return NULL; > + > + if (of_find_property(np, "gpio-hog", NULL)) > + return NULL; > + > + if (of_parse_phandle_with_args(np, prop_name, "#gpio-cells", index, > + &sup_args)) > + return NULL; > + > + return sup_args.np; > +} > + > static const struct supplier_bindings of_supplier_bindings[] = { > { .parse_prop = parse_clocks, }, > { .parse_prop = parse_interconnects, }, > @@ -1296,6 +1314,7 @@ static const struct supplier_bindings of_supplier_bindings[] = { > { .parse_prop = parse_pinctrl6, }, > { .parse_prop = parse_pinctrl7, }, > { .parse_prop = parse_pinctrl8, }, > + { .parse_prop = parse_gpio_compat, }, > { .parse_prop = parse_regulators, }, > { .parse_prop = parse_gpio, }, > { .parse_prop = parse_gpios, }, > -- > 2.30.0.284.gd98b1dd5eaa7-goog > Please ignore this patch. I'm going to make this part of a series I'll be sending out. -Saravana
diff --git a/drivers/of/property.c b/drivers/of/property.c index 5f9eed79a8aa..0b256ce9d7d5 100644 --- a/drivers/of/property.c +++ b/drivers/of/property.c @@ -1271,6 +1271,24 @@ static struct device_node *parse_iommu_maps(struct device_node *np, return of_parse_phandle(np, prop_name, (index * 4) + 1); } +static struct device_node *parse_gpio_compat(struct device_node *np, + const char *prop_name, int index) +{ + struct of_phandle_args sup_args; + + if (strcmp(prop_name, "gpio") && strcmp(prop_name, "gpios")) + return NULL; + + if (of_find_property(np, "gpio-hog", NULL)) + return NULL; + + if (of_parse_phandle_with_args(np, prop_name, "#gpio-cells", index, + &sup_args)) + return NULL; + + return sup_args.np; +} + static const struct supplier_bindings of_supplier_bindings[] = { { .parse_prop = parse_clocks, }, { .parse_prop = parse_interconnects, }, @@ -1296,6 +1314,7 @@ static const struct supplier_bindings of_supplier_bindings[] = { { .parse_prop = parse_pinctrl6, }, { .parse_prop = parse_pinctrl7, }, { .parse_prop = parse_pinctrl8, }, + { .parse_prop = parse_gpio_compat, }, { .parse_prop = parse_regulators, }, { .parse_prop = parse_gpio, }, { .parse_prop = parse_gpios, },
To provide backward compatibility for boards that use deprecated DT bindings, we need to add fw_devlink support for "gpio" and "gpios". Cc: linux-tegra <linux-tegra@vger.kernel.org> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Fixes: e590474768f1 ("driver core: Set fw_devlink=on by default") Tested-by: Jon Hunter <jonathanh@nvidia.com> Signed-off-by: Saravana Kannan <saravanak@google.com> --- Greg/Rob, I think it's better for this to go into driver-core-next because this fixed fw_devlink=on change that's queued for 5.12-rcX. -Saravana drivers/of/property.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)