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

pinctrl: Include <linux/gpio/driver.h> nothing else

These drivers are GPIO drivers, and the do not need to use the
legacy header in <linux/gpio.h>, go directly for
<linux/gpio/driver.h> instead.

Replace any use of GPIOF_* with 0/1, these flags are for
consumers, not drivers.

Get rid of a few gpio_to_irq() users that was littering
around the place, use local callbacks or avoid using it at
all.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

Linus Walleij 1c5fb66a e897b386

+33 -41
+2 -3
drivers/pinctrl/intel/pinctrl-baytrail.c
··· 11 11 #include <linux/types.h> 12 12 #include <linux/bitops.h> 13 13 #include <linux/interrupt.h> 14 - #include <linux/gpio.h> 15 14 #include <linux/gpio/driver.h> 16 15 #include <linux/acpi.h> 17 16 #include <linux/platform_device.h> ··· 1359 1360 raw_spin_unlock_irqrestore(&vg->lock, flags); 1360 1361 1361 1362 if (!(value & BYT_OUTPUT_EN)) 1362 - return GPIOF_DIR_OUT; 1363 + return 0; 1363 1364 if (!(value & BYT_INPUT_EN)) 1364 - return GPIOF_DIR_IN; 1365 + return 1; 1365 1366 1366 1367 return -EINVAL; 1367 1368 }
-1
drivers/pinctrl/intel/pinctrl-cherryview.c
··· 15 15 #include <linux/module.h> 16 16 #include <linux/init.h> 17 17 #include <linux/types.h> 18 - #include <linux/gpio.h> 19 18 #include <linux/gpio/driver.h> 20 19 #include <linux/acpi.h> 21 20 #include <linux/pinctrl/pinctrl.h>
+1 -1
drivers/pinctrl/mediatek/mtk-eint.c
··· 11 11 12 12 #include <linux/delay.h> 13 13 #include <linux/err.h> 14 - #include <linux/gpio.h> 14 + #include <linux/gpio/driver.h> 15 15 #include <linux/io.h> 16 16 #include <linux/irqchip/chained_irq.h> 17 17 #include <linux/irqdomain.h>
-1
drivers/pinctrl/mediatek/pinctrl-mt7622.c
··· 13 13 * GNU General Public License for more details. 14 14 */ 15 15 16 - #include <linux/gpio.h> 17 16 #include <linux/gpio/driver.h> 18 17 #include <linux/io.h> 19 18 #include <linux/init.h>
+1 -1
drivers/pinctrl/meson/pinctrl-meson.c
··· 41 41 */ 42 42 43 43 #include <linux/device.h> 44 - #include <linux/gpio.h> 44 + #include <linux/gpio/driver.h> 45 45 #include <linux/init.h> 46 46 #include <linux/io.h> 47 47 #include <linux/of.h>
+1 -1
drivers/pinctrl/meson/pinctrl-meson.h
··· 11 11 * along with this program. If not, see <http://www.gnu.org/licenses/>. 12 12 */ 13 13 14 - #include <linux/gpio.h> 14 + #include <linux/gpio/driver.h> 15 15 #include <linux/pinctrl/pinctrl.h> 16 16 #include <linux/platform_device.h> 17 17 #include <linux/regmap.h>
+1 -1
drivers/pinctrl/mvebu/pinctrl-mvebu.c
··· 17 17 #include <linux/of_address.h> 18 18 #include <linux/of_platform.h> 19 19 #include <linux/err.h> 20 - #include <linux/gpio.h> 20 + #include <linux/gpio/driver.h> 21 21 #include <linux/pinctrl/machine.h> 22 22 #include <linux/pinctrl/pinconf.h> 23 23 #include <linux/pinctrl/pinctrl.h>
+1 -1
drivers/pinctrl/nomadik/pinctrl-ab8500.c
··· 9 9 */ 10 10 11 11 #include <linux/kernel.h> 12 - #include <linux/gpio.h> 12 + #include <linux/gpio/driver.h> 13 13 #include <linux/pinctrl/pinctrl.h> 14 14 #include <linux/mfd/abx500/ab8500.h> 15 15 #include "pinctrl-abx500.h"
+1 -1
drivers/pinctrl/nomadik/pinctrl-ab8505.c
··· 9 9 */ 10 10 11 11 #include <linux/kernel.h> 12 - #include <linux/gpio.h> 12 + #include <linux/gpio/driver.h> 13 13 #include <linux/pinctrl/pinctrl.h> 14 14 #include <linux/mfd/abx500/ab8500.h> 15 15 #include "pinctrl-abx500.h"
+1 -1
drivers/pinctrl/nomadik/pinctrl-abx500.c
··· 18 18 #include <linux/of.h> 19 19 #include <linux/of_device.h> 20 20 #include <linux/platform_device.h> 21 - #include <linux/gpio.h> 21 + #include <linux/gpio/driver.h> 22 22 #include <linux/irq.h> 23 23 #include <linux/irqdomain.h> 24 24 #include <linux/interrupt.h>
+3 -3
drivers/pinctrl/nomadik/pinctrl-nomadik.c
··· 17 17 #include <linux/io.h> 18 18 #include <linux/clk.h> 19 19 #include <linux/err.h> 20 - #include <linux/gpio.h> 20 + #include <linux/gpio/driver.h> 21 21 #include <linux/spinlock.h> 22 22 #include <linux/interrupt.h> 23 23 #include <linux/slab.h> ··· 203 203 204 204 #define GPIO_BLOCK_SHIFT 5 205 205 #define NMK_GPIO_PER_CHIP (1 << GPIO_BLOCK_SHIFT) 206 - #define NMK_MAX_BANKS DIV_ROUND_UP(ARCH_NR_GPIOS, NMK_GPIO_PER_CHIP) 206 + #define NMK_MAX_BANKS DIV_ROUND_UP(512, NMK_GPIO_PER_CHIP) 207 207 208 208 /* Register in the logic block */ 209 209 #define NMK_GPIO_DAT 0x00 ··· 971 971 data_out ? "hi" : "lo", 972 972 (mode < 0) ? "unknown" : modes[mode]); 973 973 } else { 974 - int irq = gpio_to_irq(gpio); 974 + int irq = chip->to_irq(chip, gpio); 975 975 struct irq_desc *desc = irq_to_desc(irq); 976 976 int pullidx = 0; 977 977 int val;
+1 -1
drivers/pinctrl/pinctrl-amd.c
··· 24 24 #include <linux/errno.h> 25 25 #include <linux/log2.h> 26 26 #include <linux/io.h> 27 - #include <linux/gpio.h> 27 + #include <linux/gpio/driver.h> 28 28 #include <linux/slab.h> 29 29 #include <linux/platform_device.h> 30 30 #include <linux/mutex.h>
+1 -1
drivers/pinctrl/pinctrl-as3722.c
··· 21 21 */ 22 22 23 23 #include <linux/delay.h> 24 - #include <linux/gpio.h> 24 + #include <linux/gpio/driver.h> 25 25 #include <linux/kernel.h> 26 26 #include <linux/module.h> 27 27 #include <linux/mfd/as3722.h>
+2 -2
drivers/pinctrl/pinctrl-at91.c
··· 16 16 #include <linux/slab.h> 17 17 #include <linux/interrupt.h> 18 18 #include <linux/io.h> 19 - #include <linux/gpio.h> 19 + #include <linux/gpio/driver.h> 20 20 #include <linux/pinctrl/machine.h> 21 21 #include <linux/pinctrl/pinconf.h> 22 22 #include <linux/pinctrl/pinctrl.h> ··· 1487 1487 return 0; 1488 1488 case IRQ_TYPE_NONE: 1489 1489 default: 1490 - pr_warn("AT91: No type for irq %d\n", gpio_to_irq(d->irq)); 1490 + pr_warn("AT91: No type for GPIO irq offset %d\n", d->irq); 1491 1491 return -EINVAL; 1492 1492 } 1493 1493
+1 -1
drivers/pinctrl/pinctrl-coh901.c
··· 15 15 #include <linux/clk.h> 16 16 #include <linux/err.h> 17 17 #include <linux/platform_device.h> 18 - #include <linux/gpio.h> 18 + #include <linux/gpio/driver.h> 19 19 #include <linux/slab.h> 20 20 #include <linux/pinctrl/consumer.h> 21 21 #include <linux/pinctrl/pinconf-generic.h>
-1
drivers/pinctrl/pinctrl-digicolor.c
··· 20 20 #include <linux/of.h> 21 21 #include <linux/of_device.h> 22 22 #include <linux/io.h> 23 - #include <linux/gpio.h> 24 23 #include <linux/gpio/driver.h> 25 24 #include <linux/spinlock.h> 26 25 #include <linux/pinctrl/machine.h>
+1 -1
drivers/pinctrl/pinctrl-falcon.c
··· 10 10 * Copyright (C) 2012 John Crispin <john@phrozen.org> 11 11 */ 12 12 13 - #include <linux/gpio.h> 13 + #include <linux/gpio/driver.h> 14 14 #include <linux/interrupt.h> 15 15 #include <linux/slab.h> 16 16 #include <linux/export.h>
+1 -1
drivers/pinctrl/pinctrl-mcp23s08.c
··· 4 4 #include <linux/device.h> 5 5 #include <linux/mutex.h> 6 6 #include <linux/module.h> 7 - #include <linux/gpio.h> 7 + #include <linux/gpio/driver.h> 8 8 #include <linux/i2c.h> 9 9 #include <linux/spi/spi.h> 10 10 #include <linux/spi/mcp23s08.h>
-1
drivers/pinctrl/pinctrl-pistachio.c
··· 9 9 * version 2, as published by the Free Software Foundation. 10 10 */ 11 11 12 - #include <linux/gpio.h> 13 12 #include <linux/gpio/driver.h> 14 13 #include <linux/interrupt.h> 15 14 #include <linux/io.h>
+1 -1
drivers/pinctrl/pinctrl-rockchip.c
··· 27 27 #include <linux/platform_device.h> 28 28 #include <linux/io.h> 29 29 #include <linux/bitops.h> 30 - #include <linux/gpio.h> 30 + #include <linux/gpio/driver.h> 31 31 #include <linux/of_address.h> 32 32 #include <linux/of_irq.h> 33 33 #include <linux/pinctrl/machine.h>
+1 -1
drivers/pinctrl/qcom/pinctrl-msm.c
··· 24 24 #include <linux/pinctrl/pinconf.h> 25 25 #include <linux/pinctrl/pinconf-generic.h> 26 26 #include <linux/slab.h> 27 - #include <linux/gpio.h> 27 + #include <linux/gpio/driver.h> 28 28 #include <linux/interrupt.h> 29 29 #include <linux/spinlock.h> 30 30 #include <linux/reboot.h>
+1 -1
drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
··· 11 11 * GNU General Public License for more details. 12 12 */ 13 13 14 - #include <linux/gpio.h> 14 + #include <linux/gpio/driver.h> 15 15 #include <linux/module.h> 16 16 #include <linux/of.h> 17 17 #include <linux/of_irq.h>
+1 -1
drivers/pinctrl/qcom/pinctrl-spmi-mpp.c
··· 11 11 * GNU General Public License for more details. 12 12 */ 13 13 14 - #include <linux/gpio.h> 14 + #include <linux/gpio/driver.h> 15 15 #include <linux/module.h> 16 16 #include <linux/of.h> 17 17 #include <linux/of_irq.h>
+1 -1
drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c
··· 20 20 #include <linux/pinctrl/pinconf-generic.h> 21 21 #include <linux/slab.h> 22 22 #include <linux/regmap.h> 23 - #include <linux/gpio.h> 23 + #include <linux/gpio/driver.h> 24 24 #include <linux/interrupt.h> 25 25 #include <linux/of_device.h> 26 26 #include <linux/of_irq.h>
+1 -1
drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c
··· 20 20 #include <linux/pinctrl/pinconf-generic.h> 21 21 #include <linux/slab.h> 22 22 #include <linux/regmap.h> 23 - #include <linux/gpio.h> 23 + #include <linux/gpio/driver.h> 24 24 #include <linux/interrupt.h> 25 25 #include <linux/of_device.h> 26 26 #include <linux/of_irq.h>
+1 -1
drivers/pinctrl/samsung/pinctrl-samsung.c
··· 20 20 #include <linux/io.h> 21 21 #include <linux/slab.h> 22 22 #include <linux/err.h> 23 - #include <linux/gpio.h> 23 + #include <linux/gpio/driver.h> 24 24 #include <linux/irqdomain.h> 25 25 #include <linux/of_device.h> 26 26 #include <linux/spinlock.h>
+1 -1
drivers/pinctrl/samsung/pinctrl-samsung.h
··· 19 19 #include <linux/pinctrl/consumer.h> 20 20 #include <linux/pinctrl/machine.h> 21 21 22 - #include <linux/gpio.h> 22 + #include <linux/gpio/driver.h> 23 23 24 24 /** 25 25 * enum pincfg_type - possible pin configuration types supported.
+1 -2
drivers/pinctrl/sirf/pinctrl-atlas7.c
··· 19 19 #include <linux/of_device.h> 20 20 #include <linux/of_platform.h> 21 21 #include <linux/of_irq.h> 22 - #include <linux/of_gpio.h> 23 22 #include <linux/pinctrl/machine.h> 24 23 #include <linux/pinctrl/pinconf.h> 25 24 #include <linux/pinctrl/pinctrl.h> 26 25 #include <linux/pinctrl/pinmux.h> 27 26 #include <linux/pinctrl/consumer.h> 28 27 #include <linux/pinctrl/pinconf-generic.h> 29 - #include <linux/gpio.h> 28 + #include <linux/gpio/driver.h> 30 29 31 30 /* Definition of Pad&Mux Properties */ 32 31 #define N 0
+1 -1
drivers/pinctrl/sirf/pinctrl-sirf.c
··· 27 27 #include <linux/of_device.h> 28 28 #include <linux/of_platform.h> 29 29 #include <linux/bitops.h> 30 - #include <linux/gpio.h> 30 + #include <linux/gpio/driver.h> 31 31 #include <linux/of_gpio.h> 32 32 33 33 #include "pinctrl-sirf.h"
+1 -1
drivers/pinctrl/spear/pinctrl-spear.h
··· 12 12 #ifndef __PINMUX_SPEAR_H__ 13 13 #define __PINMUX_SPEAR_H__ 14 14 15 - #include <linux/gpio.h> 15 + #include <linux/gpio/driver.h> 16 16 #include <linux/io.h> 17 17 #include <linux/pinctrl/pinctrl.h> 18 18 #include <linux/types.h>
+2 -4
drivers/pinctrl/vt8500/pinctrl-wmt.c
··· 494 494 u32 val; 495 495 496 496 val = readl_relaxed(data->base + reg_dir); 497 - if (val & BIT(bit)) 498 - return GPIOF_DIR_OUT; 499 - else 500 - return GPIOF_DIR_IN; 497 + /* Return 0 == output, 1 == input */ 498 + return !(val & BIT(bit)); 501 499 } 502 500 503 501 static int wmt_gpio_get_value(struct gpio_chip *chip, unsigned offset)
+1 -1
drivers/pinctrl/vt8500/pinctrl-wmt.h
··· 13 13 * more details. 14 14 */ 15 15 16 - #include <linux/gpio.h> 16 + #include <linux/gpio/driver.h> 17 17 18 18 /* VT8500 has no enable register in the extgpio bank. */ 19 19 #define NO_REG 0xFFFF