Merge remote-tracking branches 'spi/topic/fsl-dspi', 'spi/topic/imx', 'spi/topic...

diff --cc drivers/spi/spi-imx.c
index 40390d31a93b3aa4a4da8a7828dee2b0e7a16b4e,79ddefe4180d6ccd643afd36e003af8997a8fa39,301cdb721badcabce4c74084026518aa20c08db0,79ddefe4180d6ccd643afd36e003af8997a8fa39,79ddefe4180d6ccd643afd36e003af8997a8fa39,79ddefe4180d6ccd643afd36e003af8997a8fa39..6f57592a7f95ad0980362dd69840d72846cbad77
--- 1/drivers/spi/spi-imx.c
--- 2/drivers/spi/spi-imx.c
--- 3/drivers/spi/spi-imx.c
--- 4/drivers/spi/spi-imx.c
--- 5/drivers/spi/spi-imx.c
--- 6/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;