diff options
| author | Mark Brown <broonie@kernel.org> | 2020-07-29 14:52:00 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-07-29 14:52:00 +0100 |
| commit | 11ba28229f8258164731e42f4c3e93762cb6578e (patch) | |
| tree | fe4f9a734dcae7507697a0dbec48fc064d2a31d0 /arch/arm/mach-imx/devices/devices-common.h | |
| parent | 8ade0c2fabd3f15e334cc1b8e3780477ae7b9662 (diff) | |
| parent | 1d5cd4e7773c834db011f6f0989b1882adbf13c9 (diff) | |
| download | linux-11ba28229f8258164731e42f4c3e93762cb6578e.tar.bz2 | |
Merge remote-tracking branch 'spi/for-5.9' into spi-next
Diffstat (limited to 'arch/arm/mach-imx/devices/devices-common.h')
| -rw-r--r-- | arch/arm/mach-imx/devices/devices-common.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/devices/devices-common.h b/arch/arm/mach-imx/devices/devices-common.h index ae84c08e11fa..327a1de7dce1 100644 --- a/arch/arm/mach-imx/devices/devices-common.h +++ b/arch/arm/mach-imx/devices/devices-common.h @@ -6,6 +6,7 @@ #include <linux/kernel.h> #include <linux/platform_device.h> #include <linux/init.h> +#include <linux/gpio/machine.h> #include <linux/platform_data/dma-imx-sdma.h> extern struct device mxc_aips_bus; @@ -276,7 +277,6 @@ struct platform_device *__init imx_add_sdhci_esdhc_imx( const struct imx_sdhci_esdhc_imx_data *data, const struct esdhc_platform_data *pdata); -#include <linux/platform_data/spi-imx.h> struct imx_spi_imx_data { const char *devid; int id; @@ -285,8 +285,7 @@ struct imx_spi_imx_data { int irq; }; struct platform_device *__init imx_add_spi_imx( - const struct imx_spi_imx_data *data, - const struct spi_imx_master *pdata); + const struct imx_spi_imx_data *data, struct gpiod_lookup_table *gtable); struct platform_device *imx_add_imx_dma(char *name, resource_size_t iobase, int irq); |