From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 14 Apr 2021 17:53:39 +0000 (+0200)
Subject: Merge tag 'v5.12-rc7' into driver-core-next
X-Git-Tag: io_uring-5.13-2021-05-07~89^2~4
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a00fcbc115f9c934fe92e96358a7f392bb5549f0;p=linux-2.6-block.git

Merge tag 'v5.12-rc7' into driver-core-next

We need the driver core fix in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

a00fcbc115f9c934fe92e96358a7f392bb5549f0
diff --cc drivers/base/dd.c
index 2f00d1d5b414,37a5e5f8b221..ecd7cf848daf
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@@ -299,10 -292,8 +299,10 @@@ int driver_deferred_probe_check_state(s
  
  static void deferred_probe_timeout_work_func(struct work_struct *work)
  {
- 	struct device_private *private, *p;
+ 	struct device_private *p;
  
 +	fw_devlink_drivers_done();
 +
  	driver_deferred_probe_timeout = 0;
  	driver_deferred_probe_trigger();
  	flush_work(&deferred_probe_work);
diff --cc drivers/of/property.c
index 2bb3158c9e43,78427c85bef3..aab6383f0219
--- a/drivers/of/property.c
+++ b/drivers/of/property.c
@@@ -1268,10 -1260,18 +1268,19 @@@ DEFINE_SIMPLE_PROP(pinctrl5, "pinctrl-5
  DEFINE_SIMPLE_PROP(pinctrl6, "pinctrl-6", NULL)
  DEFINE_SIMPLE_PROP(pinctrl7, "pinctrl-7", NULL)
  DEFINE_SIMPLE_PROP(pinctrl8, "pinctrl-8", NULL)
 +DEFINE_SIMPLE_PROP(remote_endpoint, "remote-endpoint", NULL)
  DEFINE_SUFFIX_PROP(regulators, "-supply", NULL)
  DEFINE_SUFFIX_PROP(gpio, "-gpio", "#gpio-cells")
- DEFINE_SUFFIX_PROP(gpios, "-gpios", "#gpio-cells")
+ 
+ static struct device_node *parse_gpios(struct device_node *np,
+ 				       const char *prop_name, int index)
+ {
+ 	if (!strcmp_suffix(prop_name, ",nr-gpios"))
+ 		return NULL;
+ 
+ 	return parse_suffix_prop_cells(np, prop_name, index, "-gpios",
+ 				       "#gpio-cells");
+ }
  
  static struct device_node *parse_iommu_maps(struct device_node *np,
  					    const char *prop_name, int index)