Merge remote-tracking branch 'spi/for-5.10' into spi-next
authorMark Brown <broonie@kernel.org>
Fri, 9 Oct 2020 15:01:22 +0000 (16:01 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 9 Oct 2020 15:01:22 +0000 (16:01 +0100)
1  2 
Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.txt
drivers/spi/spi-cadence-quadspi.c
drivers/spi/spi-fsl-dspi.c
drivers/spi/spi-fsl-espi.c
drivers/spi/spi-imx.c
drivers/spi/spi-stm32.c

Simple merge
Simple merge
Simple merge
index e38e5ad3c70680cbe620124bc91dc9f3d83acffc,5158c48bd4dbb414087e6333957b3ff8a7ed931a..060b1f5c9b048bbc85139d64b88586dd2bd88bec
@@@ -1707,11 -1709,9 +1709,9 @@@ static int spi_imx_probe(struct platfor
        ret = spi_bitbang_start(&spi_imx->bitbang);
        if (ret) {
                dev_err(&pdev->dev, "bitbang start failed with %d\n", ret);
 -              goto out_runtime_pm_put;
 +              goto out_bitbang_start;
        }
  
-       dev_info(&pdev->dev, "probed\n");
        pm_runtime_mark_last_busy(spi_imx->dev);
        pm_runtime_put_autosuspend(spi_imx->dev);
  
Simple merge