Merge tag 'gpio-v4.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio (c4a6c70f) · Commits · 戴 / test

Pull GPIO fixes from Linus Walleij: "Some GPIO fixes that have been boiling the last two weeks or so. Nothing special, I'm trying to sort out some Kconfig business and Russell needs a fix in for -his SA1100 rework. Summary: - Revert a pointless attempt to add an include to solve the UM allyes compilation problem. - Make the mcp23s08 depend on OF_GPIO as it uses it and doesn't compile properly without it. - Fix a probing problem for ucb1x00" * tag 'gpio-v4.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: gpio: sa1100: fix irq probing for ucb1x00 gpio: mcp23s08: make driver depend on OF_GPIO Revert "gpio: include <linux/io-mapping.h> in gpiolib-of"

drivers/gpio/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -1131,6 +1131,7 @@ menu "SPI or I2C GPIO expanders"

		config GPIO_MCP23S08
		tristate "Microchip MCP23xxx I/O expander"
		depends on OF_GPIO
		select GPIOLIB_IRQCHIP
		help
		SPI/I2C driver for Microchip MCP23S08/MCP23S17/MCP23008/MCP23017

drivers/gpio/gpio-mcp23s08.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -564,7 +564,7 @@ static int mcp23s08_probe_one(struct mcp23s08 mcp, struct device dev,
		mcp->chip.direction_output = mcp23s08_direction_output;
		mcp->chip.set = mcp23s08_set;
		mcp->chip.dbg_show = mcp23s08_dbg_show;
		#ifdef CONFIG_OF
		#ifdef CONFIG_OF_GPIO
		mcp->chip.of_gpio_n_cells = 2;
		mcp->chip.of_node = dev->of_node;
		#endif

drivers/gpio/gpio-sa1100.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -155,7 +155,7 @@ static int sa1100_gpio_irqdomain_map(struct irq_domain *d,
		{
		irq_set_chip_and_handler(irq, &sa1100_gpio_irq_chip,
		handle_edge_irq);
		irq_set_noprobe(irq);
		irq_set_probe(irq);

		return 0;
		}

drivers/gpio/gpiolib-of.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@
		#include <linux/errno.h>
		#include <linux/module.h>
		#include <linux/io.h>
		#include <linux/io-mapping.h>
		#include <linux/gpio/consumer.h>
		#include <linux/of.h>
		#include <linux/of_address.h>

Admin message