diff options
| author | Mark Brown | 2019-05-02 04:20:29 +0200 |
|---|---|---|
| committer | Mark Brown | 2019-05-02 04:20:29 +0200 |
| commit | 2e5f081003f033d37be3faf052aaccc8b6a44aa5 (patch) | |
| tree | 6d07a9bfff47b20f997ecce96162b8ca9cf7b19c /drivers/spi/spi-dw-mmio.c | |
| parent | Merge branch 'spi-5.1' into spi-linus (diff) | |
| parent | spi: Clear SPI_CS_HIGH flag from bad_bits for GPIO chip-select (diff) | |
| download | kernel-qcow2-linux-2e5f081003f033d37be3faf052aaccc8b6a44aa5.tar.gz kernel-qcow2-linux-2e5f081003f033d37be3faf052aaccc8b6a44aa5.tar.xz kernel-qcow2-linux-2e5f081003f033d37be3faf052aaccc8b6a44aa5.zip | |
Merge branch 'spi-5.2' into spi-next
Diffstat (limited to 'drivers/spi/spi-dw-mmio.c')
| -rw-r--r-- | drivers/spi/spi-dw-mmio.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c index 4bd59a93d988..de952b17bc10 100644 --- a/drivers/spi/spi-dw-mmio.c +++ b/drivers/spi/spi-dw-mmio.c @@ -30,6 +30,7 @@ struct dw_spi_mmio { struct dw_spi dws; struct clk *clk; + struct clk *pclk; void *priv; }; @@ -172,6 +173,14 @@ static int dw_spi_mmio_probe(struct platform_device *pdev) if (ret) return ret; + /* Optional clock needed to access the registers */ + dwsmmio->pclk = devm_clk_get_optional(&pdev->dev, "pclk"); + if (IS_ERR(dwsmmio->pclk)) + return PTR_ERR(dwsmmio->pclk); + ret = clk_prepare_enable(dwsmmio->pclk); + if (ret) + goto out_clk; + dws->bus_num = pdev->id; dws->max_freq = clk_get_rate(dwsmmio->clk); @@ -199,6 +208,8 @@ static int dw_spi_mmio_probe(struct platform_device *pdev) return 0; out: + clk_disable_unprepare(dwsmmio->pclk); +out_clk: clk_disable_unprepare(dwsmmio->clk); return ret; } @@ -208,6 +219,7 @@ static int dw_spi_mmio_remove(struct platform_device *pdev) struct dw_spi_mmio *dwsmmio = platform_get_drvdata(pdev); dw_spi_remove_host(&dwsmmio->dws); + clk_disable_unprepare(dwsmmio->pclk); clk_disable_unprepare(dwsmmio->clk); return 0; |