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

gpio: Explicitly include correct DT includes

The DT of_device.h and of_platform.h date back to the separate
of_platform_bus_type before it as merged into the regular platform bus.
As part of that merge prepping Arm DT support 13 years ago, they
"temporarily" include each other. They also include platform_device.h
and of.h. As a result, there's a pretty much random mix of those include
files used throughout the tree. In order to detangle these headers and
replace the implicit includes with struct declarations, users need to
explicitly include the correct includes.

Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: Romain Perier <romain.perier@gmail.com>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

authored by

Rob Herring and committed by
Bartosz Golaszewski
e91d0f05 55b2395e

+28 -39
+2 -1
drivers/gpio/gpio-ath79.c
··· 9 9 */ 10 10 11 11 #include <linux/gpio/driver.h> 12 + #include <linux/platform_device.h> 12 13 #include <linux/platform_data/gpio-ath79.h> 13 - #include <linux/of_device.h> 14 + #include <linux/of.h> 14 15 #include <linux/interrupt.h> 15 16 #include <linux/module.h> 16 17 #include <linux/irq.h>
+2 -2
drivers/gpio/gpio-brcmstb.c
··· 3 3 4 4 #include <linux/bitops.h> 5 5 #include <linux/gpio/driver.h> 6 - #include <linux/of_device.h> 7 - #include <linux/of_irq.h> 6 + #include <linux/of.h> 8 7 #include <linux/module.h> 9 8 #include <linux/irqdomain.h> 10 9 #include <linux/irqchip/chained_irq.h> 11 10 #include <linux/interrupt.h> 11 + #include <linux/platform_device.h> 12 12 13 13 enum gio_reg_index { 14 14 GIO_REG_ODEN = 0,
+1 -1
drivers/gpio/gpio-creg-snps.c
··· 8 8 #include <linux/gpio/driver.h> 9 9 #include <linux/io.h> 10 10 #include <linux/of.h> 11 - #include <linux/of_platform.h> 11 + #include <linux/platform_device.h> 12 12 13 13 #define MAX_GPIO 32 14 14
+1 -1
drivers/gpio/gpio-eic-sprd.c
··· 9 9 #include <linux/interrupt.h> 10 10 #include <linux/kernel.h> 11 11 #include <linux/module.h> 12 - #include <linux/of_device.h> 12 + #include <linux/of.h> 13 13 #include <linux/platform_device.h> 14 14 #include <linux/spinlock.h> 15 15
+1 -1
drivers/gpio/gpio-ge.c
··· 20 20 #include <linux/kernel.h> 21 21 #include <linux/io.h> 22 22 #include <linux/slab.h> 23 - #include <linux/of_device.h> 23 + #include <linux/of.h> 24 24 #include <linux/of_address.h> 25 25 #include <linux/module.h> 26 26 #include <linux/gpio/driver.h>
+1 -1
drivers/gpio/gpio-grgpio.c
··· 19 19 #include <linux/kernel.h> 20 20 #include <linux/module.h> 21 21 #include <linux/init.h> 22 + #include <linux/platform_device.h> 22 23 #include <linux/spinlock.h> 23 24 #include <linux/io.h> 24 25 #include <linux/of.h> 25 - #include <linux/of_platform.h> 26 26 #include <linux/gpio/driver.h> 27 27 #include <linux/slab.h> 28 28 #include <linux/err.h>
+1 -1
drivers/gpio/gpio-hlwd.c
··· 10 10 #include <linux/kernel.h> 11 11 #include <linux/module.h> 12 12 #include <linux/of.h> 13 - #include <linux/of_platform.h> 13 + #include <linux/platform_device.h> 14 14 #include <linux/seq_file.h> 15 15 #include <linux/slab.h> 16 16
-1
drivers/gpio/gpio-logicvc.c
··· 8 8 #include <linux/gpio/driver.h> 9 9 #include <linux/module.h> 10 10 #include <linux/of.h> 11 - #include <linux/of_device.h> 12 11 #include <linux/of_address.h> 13 12 #include <linux/platform_device.h> 14 13 #include <linux/regmap.h>
+1 -1
drivers/gpio/gpio-mb86s7x.c
··· 10 10 #include <linux/io.h> 11 11 #include <linux/init.h> 12 12 #include <linux/clk.h> 13 + #include <linux/mod_devicetable.h> 13 14 #include <linux/module.h> 14 15 #include <linux/err.h> 15 16 #include <linux/errno.h> 16 17 #include <linux/ioport.h> 17 - #include <linux/of_device.h> 18 18 #include <linux/gpio/driver.h> 19 19 #include <linux/platform_device.h> 20 20 #include <linux/spinlock.h>
+1 -1
drivers/gpio/gpio-mpc5200.c
··· 10 10 #include <linux/slab.h> 11 11 #include <linux/gpio/legacy-of-mm-gpiochip.h> 12 12 #include <linux/io.h> 13 - #include <linux/of_platform.h> 13 + #include <linux/platform_device.h> 14 14 #include <linux/module.h> 15 15 16 16 #include <asm/mpc52xx.h>
+1 -3
drivers/gpio/gpio-mpc8xxx.c
··· 9 9 #include <linux/acpi.h> 10 10 #include <linux/kernel.h> 11 11 #include <linux/init.h> 12 + #include <linux/platform_device.h> 12 13 #include <linux/spinlock.h> 13 14 #include <linux/io.h> 14 15 #include <linux/of.h> 15 - #include <linux/of_address.h> 16 - #include <linux/of_irq.h> 17 - #include <linux/of_platform.h> 18 16 #include <linux/property.h> 19 17 #include <linux/mod_devicetable.h> 20 18 #include <linux/slab.h>
-1
drivers/gpio/gpio-msc313.c
··· 6 6 #include <linux/types.h> 7 7 #include <linux/io.h> 8 8 #include <linux/of.h> 9 - #include <linux/of_device.h> 10 9 #include <linux/of_irq.h> 11 10 #include <linux/gpio/driver.h> 12 11 #include <linux/module.h>
-1
drivers/gpio/gpio-mxc.c
··· 23 23 #include <linux/syscore_ops.h> 24 24 #include <linux/gpio/driver.h> 25 25 #include <linux/of.h> 26 - #include <linux/of_device.h> 27 26 #include <linux/bug.h> 28 27 29 28 #define IMX_SCU_WAKEUP_OFF 0
-1
drivers/gpio/gpio-mxs.c
··· 14 14 #include <linux/irqdomain.h> 15 15 #include <linux/of.h> 16 16 #include <linux/of_address.h> 17 - #include <linux/of_device.h> 18 17 #include <linux/platform_device.h> 19 18 #include <linux/slab.h> 20 19 #include <linux/gpio/driver.h>
-1
drivers/gpio/gpio-omap.c
··· 22 22 #include <linux/pm_runtime.h> 23 23 #include <linux/pm.h> 24 24 #include <linux/of.h> 25 - #include <linux/of_device.h> 26 25 #include <linux/gpio/driver.h> 27 26 #include <linux/bitops.h> 28 27 #include <linux/platform_data/gpio-omap.h>
-1
drivers/gpio/gpio-palmas.c
··· 12 12 #include <linux/init.h> 13 13 #include <linux/mfd/palmas.h> 14 14 #include <linux/of.h> 15 - #include <linux/of_device.h> 16 15 #include <linux/platform_device.h> 17 16 18 17 struct palmas_gpio {
+1 -1
drivers/gpio/gpio-pmic-eic-sprd.c
··· 8 8 #include <linux/interrupt.h> 9 9 #include <linux/kernel.h> 10 10 #include <linux/module.h> 11 - #include <linux/of_device.h> 11 + #include <linux/of.h> 12 12 #include <linux/platform_device.h> 13 13 #include <linux/regmap.h> 14 14
-1
drivers/gpio/gpio-pxa.c
··· 20 20 #include <linux/irqchip/chained_irq.h> 21 21 #include <linux/io.h> 22 22 #include <linux/of.h> 23 - #include <linux/of_device.h> 24 23 #include <linux/pinctrl/consumer.h> 25 24 #include <linux/platform_device.h> 26 25 #include <linux/syscore_ops.h>
-1
drivers/gpio/gpio-rcar.c
··· 15 15 #include <linux/irq.h> 16 16 #include <linux/module.h> 17 17 #include <linux/of.h> 18 - #include <linux/of_device.h> 19 18 #include <linux/pinctrl/consumer.h> 20 19 #include <linux/platform_device.h> 21 20 #include <linux/pm_runtime.h>
+1 -1
drivers/gpio/gpio-rockchip.c
··· 17 17 #include <linux/module.h> 18 18 #include <linux/of.h> 19 19 #include <linux/of_address.h> 20 - #include <linux/of_device.h> 21 20 #include <linux/of_irq.h> 22 21 #include <linux/pinctrl/consumer.h> 23 22 #include <linux/pinctrl/pinconf-generic.h> 23 + #include <linux/platform_device.h> 24 24 #include <linux/regmap.h> 25 25 26 26 #include "../pinctrl/core.h"
+1 -1
drivers/gpio/gpio-sprd.c
··· 7 7 #include <linux/bitops.h> 8 8 #include <linux/gpio/driver.h> 9 9 #include <linux/kernel.h> 10 + #include <linux/mod_devicetable.h> 10 11 #include <linux/module.h> 11 - #include <linux/of_device.h> 12 12 #include <linux/platform_device.h> 13 13 #include <linux/spinlock.h> 14 14
+2 -1
drivers/gpio/gpio-stp-xway.c
··· 4 4 * Copyright (C) 2012 John Crispin <john@phrozen.org> 5 5 */ 6 6 7 + #include <linux/platform_device.h> 7 8 #include <linux/slab.h> 8 9 #include <linux/init.h> 9 10 #include <linux/module.h> 10 11 #include <linux/types.h> 11 - #include <linux/of_platform.h> 12 + #include <linux/of.h> 12 13 #include <linux/mutex.h> 13 14 #include <linux/gpio/driver.h> 14 15 #include <linux/io.h>
-1
drivers/gpio/gpio-syscon.c
··· 9 9 #include <linux/gpio/driver.h> 10 10 #include <linux/module.h> 11 11 #include <linux/of.h> 12 - #include <linux/of_device.h> 13 12 #include <linux/platform_device.h> 14 13 #include <linux/regmap.h> 15 14 #include <linux/mfd/syscon.h>
+1 -1
drivers/gpio/gpio-tegra.c
··· 15 15 #include <linux/interrupt.h> 16 16 #include <linux/io.h> 17 17 #include <linux/gpio/driver.h> 18 - #include <linux/of_device.h> 18 + #include <linux/of.h> 19 19 #include <linux/platform_device.h> 20 20 #include <linux/module.h> 21 21 #include <linux/seq_file.h>
+1 -1
drivers/gpio/gpio-tegra186.c
··· 11 11 #include <linux/interrupt.h> 12 12 #include <linux/irq.h> 13 13 #include <linux/module.h> 14 - #include <linux/of_device.h> 14 + #include <linux/of.h> 15 15 #include <linux/platform_device.h> 16 16 #include <linux/seq_file.h> 17 17
+1 -1
drivers/gpio/gpio-tps6586x.c
··· 15 15 #include <linux/kernel.h> 16 16 #include <linux/init.h> 17 17 #include <linux/mfd/tps6586x.h> 18 - #include <linux/of_device.h> 18 + #include <linux/of.h> 19 19 #include <linux/platform_device.h> 20 20 21 21 /* GPIO control registers */
+1 -1
drivers/gpio/gpio-tps65910.c
··· 15 15 #include <linux/i2c.h> 16 16 #include <linux/platform_device.h> 17 17 #include <linux/mfd/tps65910.h> 18 - #include <linux/of_device.h> 18 + #include <linux/of.h> 19 19 20 20 struct tps65910_gpio { 21 21 struct gpio_chip gpio_chip;
+1 -2
drivers/gpio/gpio-ts4800.c
··· 7 7 8 8 #include <linux/gpio/driver.h> 9 9 #include <linux/module.h> 10 - #include <linux/of_address.h> 11 - #include <linux/of_device.h> 10 + #include <linux/of.h> 12 11 #include <linux/platform_device.h> 13 12 14 13 #define DEFAULT_PIN_NUMBER 16
+1 -1
drivers/gpio/gpio-ts4900.c
··· 8 8 9 9 #include <linux/gpio/driver.h> 10 10 #include <linux/i2c.h> 11 - #include <linux/of_device.h> 11 + #include <linux/of.h> 12 12 #include <linux/module.h> 13 13 #include <linux/regmap.h> 14 14
-1
drivers/gpio/gpio-uniphier.c
··· 9 9 #include <linux/irqdomain.h> 10 10 #include <linux/module.h> 11 11 #include <linux/of.h> 12 - #include <linux/of_device.h> 13 12 #include <linux/of_irq.h> 14 13 #include <linux/platform_device.h> 15 14 #include <linux/spinlock.h>
-1
drivers/gpio/gpio-vf610.c
··· 17 17 #include <linux/irq.h> 18 18 #include <linux/platform_device.h> 19 19 #include <linux/of.h> 20 - #include <linux/of_device.h> 21 20 #include <linux/of_irq.h> 22 21 #include <linux/pinctrl/consumer.h> 23 22
+2 -1
drivers/gpio/gpio-wcd934x.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 2 // Copyright (c) 2019, Linaro Limited 3 3 4 + #include <linux/mod_devicetable.h> 4 5 #include <linux/module.h> 5 6 #include <linux/gpio/driver.h> 7 + #include <linux/platform_device.h> 6 8 #include <linux/regmap.h> 7 9 #include <linux/slab.h> 8 - #include <linux/of_device.h> 9 10 10 11 #define WCD_PIN_MASK(p) BIT(p) 11 12 #define WCD_REG_DIR_CTL_OFFSET 0x42
+2 -2
drivers/gpio/gpio-xilinx.c
··· 15 15 #include <linux/io.h> 16 16 #include <linux/irq.h> 17 17 #include <linux/module.h> 18 - #include <linux/of_device.h> 19 - #include <linux/of_platform.h> 18 + #include <linux/of.h> 19 + #include <linux/platform_device.h> 20 20 #include <linux/pm_runtime.h> 21 21 #include <linux/slab.h> 22 22
+1 -1
drivers/gpio/gpio-xra1403.c
··· 8 8 #include <linux/bitops.h> 9 9 #include <linux/gpio/driver.h> 10 10 #include <linux/kernel.h> 11 + #include <linux/mod_devicetable.h> 11 12 #include <linux/module.h> 12 13 #include <linux/mutex.h> 13 - #include <linux/of_device.h> 14 14 #include <linux/seq_file.h> 15 15 #include <linux/spi/spi.h> 16 16 #include <linux/regmap.h>