From: Mark Brown <broonie@kernel.org>
Date: Wed, 29 Jul 2020 13:52:00 +0000 (+0100)
Subject: Merge remote-tracking branch 'spi/for-5.9' into spi-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=11ba28229f8258164731e42f4c3e93762cb6578e;p=linux.git

Merge remote-tracking branch 'spi/for-5.9' into spi-next
---

11ba28229f8258164731e42f4c3e93762cb6578e
diff --cc arch/arm/mach-imx/devices/devices-common.h
index ae84c08e11fa4,f8f3e4967c31f..327a1de7dce1c
--- a/arch/arm/mach-imx/devices/devices-common.h
+++ b/arch/arm/mach-imx/devices/devices-common.h
@@@ -285,10 -285,9 +285,9 @@@ 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, int irq_err);
 +					int irq);
  struct platform_device *imx_add_imx_sdma(char *name,
  	resource_size_t iobase, int irq, struct sdma_platform_data *pdata);