Commit eb58f2b9 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski
Browse files

gpiolib: match secondary fwnode too in gpio_device_find_by_fwnode() 



In GPIOLIB, during fwnode lookup, after having resolved the consumer's
reference to a specific fwnode, we only match it against the primary
node of the controllers. Let's extend that to also the secondary node by
reworking gpio_chip_match_by_fwnode()

Suggested-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: default avatarDanilo Krummrich <dakr@kernel.org>
Reviewed-by: default avatarRafael J. Wysocki (Intel) <rafael@kernel.org>
Reviewed-by: default avatarLinus Walleij <linusw@kernel.org>
Reviewed-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Link: https://patch.msgid.link/20260226-device-match-secondary-fwnode-v4-1-27bd0cfbd8c6@oss.qualcomm.com


Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
parent fa4a3a95

drivers/gpio/gpiolib.c

+11 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/errno.h>

#include <linux/file.h>

#include <linux/fs.h>

#include <linux/fwnode.h>

#include <linux/idr.h>

#include <linux/interrupt.h>

#include <linux/irq.h>
@@ -1394,7 +1395,16 @@ EXPORT_SYMBOL_GPL(gpio_device_find_by_label); 


static int gpio_chip_match_by_fwnode(struct gpio_chip *gc, const void *fwnode)

{

	return device_match_fwnode(&gc->gpiodev->dev, fwnode);

	struct device *dev = &gc->gpiodev->dev;

	struct fwnode_handle *node = dev_fwnode(dev);



	if (IS_ERR(fwnode))

		return 0;



	if (device_match_fwnode(dev, fwnode))

		return 1;



	return node && node->secondary == fwnode;

}



/**