diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mci/imx-esdhc.c | 1 | ||||
| -rw-r--r-- | drivers/spi/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/spi/imx_spi.c | 7 |
3 files changed, 8 insertions, 2 deletions
diff --git a/drivers/mci/imx-esdhc.c b/drivers/mci/imx-esdhc.c index 55e8371dd8..b91f94b99c 100644 --- a/drivers/mci/imx-esdhc.c +++ b/drivers/mci/imx-esdhc.c @@ -630,7 +630,6 @@ static int fsl_esdhc_probe(struct device_d *dev) host->clk = clk_get(dev, "per"); if (IS_ERR(host->clk)) return PTR_ERR(host->clk); - clk_enable(host->clk); ret = clk_enable(host->clk); if (ret) { diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index dd1b21451d..84945744ef 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -38,7 +38,7 @@ config DRIVER_SPI_IMX_0_7 config DRIVER_SPI_IMX_2_3 bool - depends on ARCH_IMX50 || ARCH_IMX51 || ARCH_IMX53 || ARCH_IMX6 + depends on ARCH_IMX50 || ARCH_IMX51 || ARCH_IMX53 || ARCH_IMX6 || ARCH_IMX7 default y config DRIVER_SPI_MXS diff --git a/drivers/spi/imx_spi.c b/drivers/spi/imx_spi.c index 0827de7786..10621d00c8 100644 --- a/drivers/spi/imx_spi.c +++ b/drivers/spi/imx_spi.c @@ -624,6 +624,13 @@ static int imx_spi_probe(struct device_d *dev) goto err_free; } + ret = clk_enable(imx->clk); + if (ret) { + dev_err(dev, "Failed to enable clock: %s\n", + strerror(ret)); + return ret; + } + imx->chipselect = devdata->chipselect; imx->xchg_single = devdata->xchg_single; imx->do_transfer = devdata->do_transfer; |