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

diff --cc arch/arm/mach-imx/devices/devices-common.h
index ae84c08,f8f3e49..327a1de
--- 1/arch/arm/mach-imx/devices/devices-common.h
--- 2/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);