diff options
-rw-r--r-- | drivers/spi/spi-imx.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index fe35aaea323b..5ddd32ba2521 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c | |||
@@ -1613,11 +1613,6 @@ static int spi_imx_probe(struct platform_device *pdev) | |||
1613 | spi_imx->devtype_data->intctrl(spi_imx, 0); | 1613 | spi_imx->devtype_data->intctrl(spi_imx, 0); |
1614 | 1614 | ||
1615 | master->dev.of_node = pdev->dev.of_node; | 1615 | master->dev.of_node = pdev->dev.of_node; |
1616 | ret = spi_bitbang_start(&spi_imx->bitbang); | ||
1617 | if (ret) { | ||
1618 | dev_err(&pdev->dev, "bitbang start failed with %d\n", ret); | ||
1619 | goto out_clk_put; | ||
1620 | } | ||
1621 | 1616 | ||
1622 | if (!spi_imx->slave_mode) { | 1617 | if (!spi_imx->slave_mode) { |
1623 | if (!master->cs_gpios) { | 1618 | if (!master->cs_gpios) { |
@@ -1641,6 +1636,12 @@ static int spi_imx_probe(struct platform_device *pdev) | |||
1641 | } | 1636 | } |
1642 | } | 1637 | } |
1643 | 1638 | ||
1639 | ret = spi_bitbang_start(&spi_imx->bitbang); | ||
1640 | if (ret) { | ||
1641 | dev_err(&pdev->dev, "bitbang start failed with %d\n", ret); | ||
1642 | goto out_clk_put; | ||
1643 | } | ||
1644 | |||
1644 | dev_info(&pdev->dev, "probed\n"); | 1645 | dev_info(&pdev->dev, "probed\n"); |
1645 | 1646 | ||
1646 | clk_disable(spi_imx->clk_ipg); | 1647 | clk_disable(spi_imx->clk_ipg); |