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

Commit 1ce5bdb8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull GPIO fixes from Linus Walleij:
 "Here is a set of GPIO fixes for the v4.9 kernel series:

   - Fix up off-by one and line offset validation, info leak to
     userspace, and reject invalid flags. Those are especially valuable
     hardening patches from Lars-Peter Clausen, all tagged for stable.

   - Fix module autoload for TS4800 and ATH79.

   - Correct the IRQ handler for MPC8xxx to use handle_level_irq() as it
     (a) reacts to edges not levels and (b) even implements .irq_ack().
     We were missing IRQs here.

   - Fix the error path for acpi_dev_gpio_irq_get()

   - Fix a memory leak in the MXS driver.

   - Fix an annoying typo in the STMPE driver.

   - Put a dependency on sysfs to the mockup driver"

* tag 'gpio-v4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio: mpc8xxx: Correct irq handler function
  gpio: ath79: Fix module autoload
  gpio: ts4800: Fix module autoload
  gpio: GPIO_GET_LINEEVENT_IOCTL: Reject invalid line and event flags
  gpio: GPIO_GET_LINEHANDLE_IOCTL: Reject invalid line flags
  gpio: GPIOHANDLE_GET_LINE_VALUES_IOCTL: Fix information leak
  gpio: GPIO_GET_LINEEVENT_IOCTL: Validate line offset
  gpio: GPIOHANDLE_GET_LINE_VALUES_IOCTL: Fix information leak
  gpio: GPIO_GET_LINEHANDLE_IOCTL: Validate line offset
  gpio: GPIO_GET_CHIPINFO_IOCTL: Fix information leak
  gpio: GPIO_GET_CHIPINFO_IOCTL: Fix line offset validation
  gpio / ACPI: fix returned error from acpi_dev_gpio_irq_get()
  gpio: mockup: add sysfs dependency
  gpio: stmpe: || vs && typo
  gpio: mxs: Unmap region obtained by of_iomap
  gpio/board.txt: point to gpiod_set_value
parents aa34e07e d71cf15b

Documentation/gpio/board.txt

+7 −4
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ Note that it only applies to the new descriptor-based interface. For a 
description of the deprecated integer-based GPIO interface please refer to

gpio-legacy.txt (actually, there is no real mapping possible with the old

interface; you just fetch an integer from somewhere and request the

corresponding GPIO.

corresponding GPIO).



All platforms can enable the GPIO library, but if the platform strictly

requires GPIO functionality to be present, it needs to select GPIOLIB from its
@@ -162,6 +162,9 @@ The driver controlling "foo.0" will then be able to obtain its GPIOs as follows: 


Since the "led" GPIOs are mapped as active-high, this example will switch their

signals to 1, i.e. enabling the LEDs. And for the "power" GPIO, which is mapped

as active-low, its actual signal will be 0 after this code. Contrary to the legacy

integer GPIO interface, the active-low property is handled during mapping and is

thus transparent to GPIO consumers.
 
as active-low, its actual signal will be 0 after this code. Contrary to the

legacy integer GPIO interface, the active-low property is handled during

mapping and is thus transparent to GPIO consumers.



A set of functions such as gpiod_set_value() is available to work with

the new descriptor-oriented interface.

drivers/gpio/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ config GPIO_MM_LANTIQ 


config GPIO_MOCKUP

	tristate "GPIO Testing Driver"

	depends on GPIOLIB

	depends on GPIOLIB && SYSFS

	select GPIO_SYSFS

	help

	  This enables GPIO Testing driver, which provides a way to test GPIO

drivers/gpio/gpio-ath79.c

+1 −0
Original line number Diff line number Diff line
@@ -219,6 +219,7 @@ static const struct of_device_id ath79_gpio_of_match[] = { 
	{ .compatible = "qca,ar9340-gpio" },

	{},

};

MODULE_DEVICE_TABLE(of, ath79_gpio_of_match);



static int ath79_gpio_probe(struct platform_device *pdev)

{

drivers/gpio/gpio-mpc8xxx.c

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ static int mpc8xxx_gpio_irq_map(struct irq_domain *h, unsigned int irq, 
				irq_hw_number_t hwirq)

{

	irq_set_chip_data(irq, h->host_data);

	irq_set_chip_and_handler(irq, &mpc8xxx_irq_chip, handle_level_irq);

	irq_set_chip_and_handler(irq, &mpc8xxx_irq_chip, handle_edge_irq);



	return 0;

}

drivers/gpio/gpio-mxs.c

+6 −2
Original line number Diff line number Diff line
@@ -308,8 +308,10 @@ static int mxs_gpio_probe(struct platform_device *pdev) 
	writel(~0U, port->base + PINCTRL_IRQSTAT(port) + MXS_CLR);



	irq_base = irq_alloc_descs(-1, 0, 32, numa_node_id());

	if (irq_base < 0)

		return irq_base;

	if (irq_base < 0) {

		err = irq_base;

		goto out_iounmap;

	}



	port->domain = irq_domain_add_legacy(np, 32, irq_base, 0,

					     &irq_domain_simple_ops, NULL);
@@ -349,6 +351,8 @@ static int mxs_gpio_probe(struct platform_device *pdev) 
	irq_domain_remove(port->domain);

out_irqdesc_free:

	irq_free_descs(irq_base, 32);

out_iounmap:

	iounmap(port->base);

	return err;

}