Commit da32d155 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-fixes-for-v6.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux 

Pull gpio fixes from Bartosz Golaszewski:

 - use the firmware node of the GPIO chip, not its label for software
   node lookup

 - fix invalid pointer access in GPIO debugfs

 - drop unused functions from gpio-tb10x

 - fix a regression in gpio-aggregator: restore the set_config()
   callback in the driver

 - correct schema $id path in ti,twl4030 DT bindings

* tag 'gpio-fixes-for-v6.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  gpio: tb10x: Drop unused tb10x_set_bits() function
  gpio: aggregator: restore the set_config operation
  gpiolib: fix invalid pointer access in debugfs
  gpio: swnode: don't use the swnode's name as the key for GPIO lookup
  dt-bindings: gpio: ti,twl4030: Correct the schema $id path
parents 5b95a500 4436f484

Documentation/devicetree/bindings/gpio/ti,twl4030-gpio.yaml

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/ti,twl4030-gpio.yaml#

$id: http://devicetree.org/schemas/gpio/ti,twl4030-gpio.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: TI TWL4030 GPIO controller

drivers/gpio/gpio-aggregator.c

+1 −0
Original line number Diff line number Diff line
@@ -723,6 +723,7 @@ struct gpiochip_fwd *devm_gpiochip_fwd_alloc(struct device *dev, 
	chip->get_multiple = gpio_fwd_get_multiple_locked;

	chip->set = gpio_fwd_set;

	chip->set_multiple = gpio_fwd_set_multiple_locked;

	chip->set_config = gpio_fwd_set_config;

	chip->to_irq = gpio_fwd_to_irq;

	chip->base = -1;

	chip->ngpio = ngpios;

drivers/gpio/gpio-tb10x.c

+0 −19
Original line number Diff line number Diff line
@@ -50,25 +50,6 @@ static inline u32 tb10x_reg_read(struct tb10x_gpio *gpio, unsigned int offs) 
	return ioread32(gpio->base + offs);

}



static inline void tb10x_reg_write(struct tb10x_gpio *gpio, unsigned int offs,

				u32 val)

{

	iowrite32(val, gpio->base + offs);

}



static inline void tb10x_set_bits(struct tb10x_gpio *gpio, unsigned int offs,

				u32 mask, u32 val)

{

	u32 r;



	guard(gpio_generic_lock_irqsave)(&gpio->chip);



	r = tb10x_reg_read(gpio, offs);

	r = (r & ~mask) | (val & mask);



	tb10x_reg_write(gpio, offs, r);

}



static int tb10x_gpio_to_irq(struct gpio_chip *chip, unsigned offset)

{

	struct tb10x_gpio *tb10x_gpio = gpiochip_get_data(chip);

drivers/gpio/gpiolib-swnode.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static struct gpio_device *swnode_get_gpio_device(struct fwnode_handle *fwnode) 
	    !strcmp(gdev_node->name, GPIOLIB_SWNODE_UNDEFINED_NAME))

		return ERR_PTR(-ENOENT);



	gdev = gpio_device_find_by_label(gdev_node->name);

	gdev = gpio_device_find_by_fwnode(fwnode);

	return gdev ?: ERR_PTR(-EPROBE_DEFER);

}

drivers/gpio/gpiolib.c

+7 −1
Original line number Diff line number Diff line
@@ -5296,6 +5296,8 @@ static void *gpiolib_seq_start(struct seq_file *s, loff_t *pos) 
	struct gpio_device *gdev;

	loff_t index = *pos;



	s->private = NULL;



	priv = kzalloc(sizeof(*priv), GFP_KERNEL);

	if (!priv)

		return NULL;
@@ -5329,7 +5331,11 @@ static void *gpiolib_seq_next(struct seq_file *s, void *v, loff_t *pos) 


static void gpiolib_seq_stop(struct seq_file *s, void *v)

{

	struct gpiolib_seq_priv *priv = s->private;

	struct gpiolib_seq_priv *priv;



	priv = s->private;

	if (!priv)

		return;



	srcu_read_unlock(&gpio_devices_srcu, priv->idx);

	kfree(priv);