tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

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"

Linus Torvalds c4a6c70f 6dc728cc

+3 -3
+1
drivers/gpio/Kconfig
··· 1131 1131 1132 1132 config GPIO_MCP23S08 1133 1133 tristate "Microchip MCP23xxx I/O expander" 1134 + depends on OF_GPIO 1134 1135 select GPIOLIB_IRQCHIP 1135 1136 help 1136 1137 SPI/I2C driver for Microchip MCP23S08/MCP23S17/MCP23008/MCP23017
+1 -1
drivers/gpio/gpio-mcp23s08.c
··· 564 564 mcp->chip.direction_output = mcp23s08_direction_output; 565 565 mcp->chip.set = mcp23s08_set; 566 566 mcp->chip.dbg_show = mcp23s08_dbg_show; 567 - #ifdef CONFIG_OF 567 + #ifdef CONFIG_OF_GPIO 568 568 mcp->chip.of_gpio_n_cells = 2; 569 569 mcp->chip.of_node = dev->of_node; 570 570 #endif
+1 -1
drivers/gpio/gpio-sa1100.c
··· 155 155 { 156 156 irq_set_chip_and_handler(irq, &sa1100_gpio_irq_chip, 157 157 handle_edge_irq); 158 - irq_set_noprobe(irq); 158 + irq_set_probe(irq); 159 159 160 160 return 0; 161 161 }
-1
drivers/gpio/gpiolib-of.c
··· 16 16 #include <linux/errno.h> 17 17 #include <linux/module.h> 18 18 #include <linux/io.h> 19 - #include <linux/io-mapping.h> 20 19 #include <linux/gpio/consumer.h> 21 20 #include <linux/of.h> 22 21 #include <linux/of_address.h>