From: Greg Kroah-Hartman Date: Mon, 22 Mar 2021 14:55:40 +0000 (+0100) Subject: drop queue-5.10/gpiolib-read-gpio-line-names-from-a-firmware-node.patch X-Git-Tag: v4.4.263~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=93bc650911e53a9ac5d95c1526efad07ff166abf;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-5.10/gpiolib-read-gpio-line-names-from-a-firmware-node.patch again. --- diff --git a/queue-5.10/gpiolib-read-gpio-line-names-from-a-firmware-node.patch b/queue-5.10/gpiolib-read-gpio-line-names-from-a-firmware-node.patch deleted file mode 100644 index 2b4b69506f1..00000000000 --- a/queue-5.10/gpiolib-read-gpio-line-names-from-a-firmware-node.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 03ea7cbc5235d6ace2724c64d54bac3f72697003 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 0a2c4adcd833..af5bb8fedfea 100644 ---- a/drivers/gpio/gpiolib.c -+++ b/drivers/gpio/gpiolib.c -@@ -364,22 +364,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; - -@@ -393,7 +389,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.10/series b/queue-5.10/series index 9b0038843f2..321349baf54 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -104,7 +104,6 @@ mips-kernel-reserve-exception-base-early-to-prevent-.patch mptcp-put-subflow-sock-on-connect-error.patch io_uring-don-t-attempt-io-reissue-from-the-ring-exit.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