Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'gpio-v4.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio 

Pull GPIO fixes from Linus Walleij:
 "Two fixes. They are both kind of important, so why not send a pull
  request on christmas eve.

   - Fix a build problem in the gpio single register created by
     refactorings.

   - Fix assignment of GPIO line names, something that was mangled by
     another patch"

* tag 'gpio-v4.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio: fix "gpio-line-names" property retrieval
  gpio: gpio-reg: fix build
parents 464e1d5f 82270335

drivers/gpio/gpio-reg.c

+2 −2
Original line number Diff line number Diff line
@@ -103,8 +103,8 @@ static int gpio_reg_to_irq(struct gpio_chip *gc, unsigned offset) 
	struct gpio_reg *r = to_gpio_reg(gc);

	int irq = r->irqs[offset];



	if (irq >= 0 && r->irq.domain)

		irq = irq_find_mapping(r->irq.domain, irq);

	if (irq >= 0 && r->irqdomain)

		irq = irq_find_mapping(r->irqdomain, irq);



	return irq;

}

drivers/gpio/gpiolib-acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -1074,7 +1074,7 @@ void acpi_gpiochip_add(struct gpio_chip *chip) 
	}



	if (!chip->names)

		devprop_gpiochip_set_names(chip);

		devprop_gpiochip_set_names(chip, dev_fwnode(chip->parent));



	acpi_gpiochip_request_regions(acpi_gpio);

	acpi_gpiochip_scan_gpios(acpi_gpio);

drivers/gpio/gpiolib-devprop.c

+7 −10
Original line number Diff line number Diff line
@@ -19,30 +19,27 @@ 
/**

 * devprop_gpiochip_set_names - Set GPIO line names using device properties

 * @chip: GPIO chip whose lines should be named, if possible

 * @fwnode: Property Node containing the gpio-line-names property

 *

 * 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 firmware node and should not be released

 * by the caller.

 */

void devprop_gpiochip_set_names(struct gpio_chip *chip)

void devprop_gpiochip_set_names(struct gpio_chip *chip,

				const struct fwnode_handle *fwnode)

{

	struct gpio_device *gdev = chip->gpiodev;

	const char **names;

	int ret, i;



	if (!chip->parent) {

		dev_warn(&gdev->dev, "GPIO chip parent is NULL\n");

		return;

	}



	ret = device_property_read_string_array(chip->parent, "gpio-line-names",

	ret = fwnode_property_read_string_array(fwnode, "gpio-line-names",

						NULL, 0);

	if (ret < 0)

		return;



	if (ret != gdev->ngpio) {

		dev_warn(chip->parent,

		dev_warn(&gdev->dev,

			 "names %d do not match number of GPIOs %d\n", ret,

			 gdev->ngpio);

		return;
@@ -52,10 +49,10 @@ void devprop_gpiochip_set_names(struct gpio_chip *chip) 
	if (!names)

		return;



	ret = device_property_read_string_array(chip->parent, "gpio-line-names",

	ret = fwnode_property_read_string_array(fwnode, "gpio-line-names",

						names, gdev->ngpio);

	if (ret < 0) {

		dev_warn(chip->parent, "failed to read GPIO line names\n");

		dev_warn(&gdev->dev, "failed to read GPIO line names\n");

		kfree(names);

		return;

	}

drivers/gpio/gpiolib-of.c

+2 −1
Original line number Diff line number Diff line
@@ -493,7 +493,8 @@ int of_gpiochip_add(struct gpio_chip *chip) 


	/* If the chip defines names itself, these take precedence */

	if (!chip->names)

		devprop_gpiochip_set_names(chip);

		devprop_gpiochip_set_names(chip,

					   of_fwnode_handle(chip->of_node));



	of_node_get(chip->of_node);

drivers/gpio/gpiolib.h

+2 −1
Original line number Diff line number Diff line
@@ -228,7 +228,8 @@ static inline int gpio_chip_hwgpio(const struct gpio_desc *desc) 
	return desc - &desc->gdev->descs[0];

}



void devprop_gpiochip_set_names(struct gpio_chip *chip);

void devprop_gpiochip_set_names(struct gpio_chip *chip,

				const struct fwnode_handle *fwnode);



/* With descriptor prefix */