From: Mark Brown <broonie@kernel.org>
Date: Fri, 26 Jan 2018 17:57:27 +0000 (+0000)
Subject: Merge remote-tracking branches 'spi/topic/fsl-dspi', 'spi/topic/imx', 'spi/topic... 
X-Git-Tag: for-linus-20180204~9^2~2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=33c58c12f091833fbb8a5af563dd2fc378448466;p=linux-block.git

Merge remote-tracking branches 'spi/topic/fsl-dspi', 'spi/topic/imx', 'spi/topic/jcore', 'spi/topic/meson' and 'spi/topic/orion' into spi-next
---

33c58c12f091833fbb8a5af563dd2fc378448466
diff --cc drivers/spi/spi-imx.c
index 40390d31a93b,79ddefe4180d,301cdb721bad,79ddefe4180d,79ddefe4180d,79ddefe4180d..6f57592a7f95
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@@@@@@ -1622,9 -1622,9 -1613,19 -1622,9 -1622,9 -1622,9 +1622,14 @@@@@@@ static int spi_imx_probe(struct platfor
      	spi_imx->devtype_data->intctrl(spi_imx, 0);
      
      	master->dev.of_node = pdev->dev.of_node;
++ +++	ret = spi_bitbang_start(&spi_imx->bitbang);
++ +++	if (ret) {
++ +++		dev_err(&pdev->dev, "bitbang start failed with %d\n", ret);
++ +++		goto out_clk_put;
++ +++	}
      
  -   	if (!spi_imx->slave_mode) {
  -   		if (!master->cs_gpios) {
  -   			dev_err(&pdev->dev, "No CS GPIOs available\n");
  -   			ret = -EINVAL;
  -   			goto out_clk_put;
  -   		}
  -   
  +   	/* Request GPIO CS lines, if any */
  +   	if (!spi_imx->slave_mode && master->cs_gpios) {
      		for (i = 0; i < master->num_chipselect; i++) {
      			if (!gpio_is_valid(master->cs_gpios[i]))
      				continue;