From: Greg Kroah-Hartman Date: Fri, 19 Mar 2021 12:36:19 +0000 (+0100) Subject: drop gpiolib-read-gpio-line-names-from-a-firmware-node.patch from 5.11 X-Git-Tag: v4.19.182~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da677bb2a03ba91a18f59769b000845310b86edf;p=thirdparty%2Fkernel%2Fstable-queue.git drop gpiolib-read-gpio-line-names-from-a-firmware-node.patch from 5.11 --- diff --git a/queue-5.11/gpiolib-read-gpio-line-names-from-a-firmware-node.patch b/queue-5.11/gpiolib-read-gpio-line-names-from-a-firmware-node.patch deleted file mode 100644 index 2eb33b93460..00000000000 --- a/queue-5.11/gpiolib-read-gpio-line-names-from-a-firmware-node.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 5dbb9ded0c59063e40c6fc3ef03a134b31e02931 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 5 Mar 2021 14:02:40 +0200 -Subject: gpiolib: Read "gpio-line-names" from a firmware node - -From: Andy Shevchenko - -[ Upstream commit b41ba2ec54a70908067034f139aa23d0dd2985ce ] - -On STM32MP1, the GPIO banks are subnodes of pin-controller@50002000, -see arch/arm/boot/dts/stm32mp151.dtsi. The driver for -pin-controller@50002000 is in drivers/pinctrl/stm32/pinctrl-stm32.c -and iterates over all of its DT subnodes when registering each GPIO -bank gpiochip. Each gpiochip has: - - - gpio_chip.parent = dev, - where dev is the device node of the pin controller - - gpio_chip.of_node = np, - which is the OF node of the GPIO bank - -Therefore, dev_fwnode(chip->parent) != of_fwnode_handle(chip.of_node), -i.e. pin-controller@50002000 != pin-controller@50002000/gpio@5000*000. - -The original code behaved correctly, as it extracted the "gpio-line-names" -from of_fwnode_handle(chip.of_node) = pin-controller@50002000/gpio@5000*000. - -To achieve the same behaviour, read property from the firmware node. - -Fixes: 7cba1a4d5e162 ("gpiolib: generalize devprop_gpiochip_set_names() for device properties") -Reported-by: Marek Vasut -Reported-by: Roman Guskov -Signed-off-by: Andy Shevchenko -Tested-by: Marek Vasut -Reviewed-by: Marek Vasut -Signed-off-by: Bartosz Golaszewski -Signed-off-by: Sasha Levin ---- - drivers/gpio/gpiolib.c | 12 ++++-------- - 1 file changed, 4 insertions(+), 8 deletions(-) - -diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c -index e4cfa27f6893..3451572166f2 100644 ---- a/drivers/gpio/gpiolib.c -+++ b/drivers/gpio/gpiolib.c -@@ -365,22 +365,18 @@ static int gpiochip_set_desc_names(struct gpio_chip *gc) - * - * Looks for device property "gpio-line-names" and if it exists assigns - * GPIO line names for the chip. The memory allocated for the assigned -- * names belong to the underlying software node and should not be released -+ * names belong to the underlying firmware node and should not be released - * by the caller. - */ - static int devprop_gpiochip_set_names(struct gpio_chip *chip) - { - struct gpio_device *gdev = chip->gpiodev; -- struct device *dev = chip->parent; -+ struct fwnode_handle *fwnode = dev_fwnode(&gdev->dev); - const char **names; - int ret, i; - int count; - -- /* GPIO chip may not have a parent device whose properties we inspect. */ -- if (!dev) -- return 0; -- -- count = device_property_string_array_count(dev, "gpio-line-names"); -+ count = fwnode_property_string_array_count(fwnode, "gpio-line-names"); - if (count < 0) - return 0; - -@@ -394,7 +390,7 @@ static int devprop_gpiochip_set_names(struct gpio_chip *chip) - if (!names) - return -ENOMEM; - -- ret = device_property_read_string_array(dev, "gpio-line-names", -+ ret = fwnode_property_read_string_array(fwnode, "gpio-line-names", - names, count); - if (ret < 0) { - dev_warn(&gdev->dev, "failed to read GPIO line names\n"); --- -2.30.1 - diff --git a/queue-5.11/series b/queue-5.11/series index 4bfcd3cd701..2bb5d8db35c 100644 --- a/queue-5.11/series +++ b/queue-5.11/series @@ -9,7 +9,6 @@ io_uring-refactor-io_cqring_wait.patch io_uring-don-t-keep-looping-for-more-events-if-we-ca.patch io_uring-simplify-do_read-return-parsing.patch io_uring-clear-iocb_waitq-for-non-eiocbqueued-return.patch -gpiolib-read-gpio-line-names-from-a-firmware-node.patch net-bonding-fix-error-return-code-of-bond_neigh_init.patch regulator-pca9450-add-sd_vsel-gpio-for-ldo5.patch regulator-pca9450-enable-system-reset-on-wdog_b-asse.patch