lkml.org 
[lkml]   [2022]   [Mar]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH V3 7/7] spi: mediatek: support spi-hclk
Date
this patch adds spi-hclk support.

Signed-off-by: Leilk Liu <leilk.liu@mediatek.com>
---
drivers/spi/spi-mt65xx.c | 85 ++++++++++++++++++++++++++++++++--------
1 file changed, 69 insertions(+), 16 deletions(-)

diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c
index 2f09b9d7a998..902013ec1223 100644
--- a/drivers/spi/spi-mt65xx.c
+++ b/drivers/spi/spi-mt65xx.c
@@ -132,7 +132,7 @@ struct mtk_spi {
u32 state;
int pad_num;
u32 *pad_sel;
- struct clk *parent_clk, *sel_clk, *spi_clk;
+ struct clk *parent_clk, *sel_clk, *spi_clk, *spi_hclk;
struct spi_transfer *cur_transfer;
u32 xfer_len;
u32 num_xfered;
@@ -1221,25 +1221,38 @@ static int mtk_spi_probe(struct platform_device *pdev)
goto err_put_master;
}

+ mdata->spi_hclk = devm_clk_get(&pdev->dev, "spi-hclk");
+ if (!IS_ERR(mdata->spi_hclk)) {
+ ret = clk_prepare_enable(mdata->spi_hclk);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "failed to enable spi_hclk (%d)\n", ret);
+ goto err_put_master;
+ }
+ }
+
ret = clk_prepare_enable(mdata->spi_clk);
if (ret < 0) {
dev_err(&pdev->dev, "failed to enable spi_clk (%d)\n", ret);
- goto err_put_master;
+ goto err_disable_spi_hclk;
}

ret = clk_set_parent(mdata->sel_clk, mdata->parent_clk);
if (ret < 0) {
dev_err(&pdev->dev, "failed to clk_set_parent (%d)\n", ret);
- clk_disable_unprepare(mdata->spi_clk);
- goto err_put_master;
+ goto err_disable_spi_clk;
}

mdata->spi_clk_hz = clk_get_rate(mdata->spi_clk);

- if (mdata->dev_comp->no_need_unprepare)
+ if (mdata->dev_comp->no_need_unprepare) {
clk_disable(mdata->spi_clk);
- else
+ if (!IS_ERR(mdata->spi_hclk))
+ clk_disable(mdata->spi_hclk);
+ } else {
clk_disable_unprepare(mdata->spi_clk);
+ if (!IS_ERR(mdata->spi_hclk))
+ clk_disable_unprepare(mdata->spi_hclk);
+ }

pm_runtime_enable(&pdev->dev);

@@ -1279,6 +1292,11 @@ static int mtk_spi_probe(struct platform_device *pdev)

err_disable_runtime_pm:
pm_runtime_disable(&pdev->dev);
+err_disable_spi_clk:
+ clk_disable_unprepare(mdata->spi_clk);
+err_disable_spi_hclk:
+ if (!IS_ERR(mdata->spi_hclk))
+ clk_disable_unprepare(mdata->spi_hclk);
err_put_master:
spi_master_put(master);

@@ -1294,8 +1312,11 @@ static int mtk_spi_remove(struct platform_device *pdev)

mtk_spi_reset(mdata);

- if (mdata->dev_comp->no_need_unprepare)
+ if (mdata->dev_comp->no_need_unprepare) {
clk_unprepare(mdata->spi_clk);
+ if (!IS_ERR(mdata->spi_hclk))
+ clk_unprepare(mdata->spi_hclk);
+ }

return 0;
}
@@ -1311,8 +1332,11 @@ static int mtk_spi_suspend(struct device *dev)
if (ret)
return ret;

- if (!pm_runtime_suspended(dev))
+ if (!pm_runtime_suspended(dev)) {
clk_disable_unprepare(mdata->spi_clk);
+ if (!IS_ERR(mdata->spi_hclk))
+ clk_disable_unprepare(mdata->spi_hclk);
+ }

return ret;
}
@@ -1329,11 +1353,23 @@ static int mtk_spi_resume(struct device *dev)
dev_err(dev, "failed to enable spi_clk (%d)\n", ret);
return ret;
}
+
+ if (!IS_ERR(mdata->spi_hclk)) {
+ clk_prepare_enable(mdata->spi_hclk);
+ if (ret < 0) {
+ dev_err(dev, "failed to enable spi_hclk (%d)\n", ret);
+ clk_disable_unprepare(mdata->spi_clk);
+ return ret;
+ }
+ }
}

ret = spi_master_resume(master);
- if (ret < 0)
+ if (ret < 0) {
clk_disable_unprepare(mdata->spi_clk);
+ if (!IS_ERR(mdata->spi_hclk))
+ clk_disable_unprepare(mdata->spi_hclk);
+ }

return ret;
}
@@ -1345,10 +1381,15 @@ static int mtk_spi_runtime_suspend(struct device *dev)
struct spi_master *master = dev_get_drvdata(dev);
struct mtk_spi *mdata = spi_master_get_devdata(master);

- if (mdata->dev_comp->no_need_unprepare)
+ if (mdata->dev_comp->no_need_unprepare) {
clk_disable(mdata->spi_clk);
- else
+ if (!IS_ERR(mdata->spi_hclk))
+ clk_disable(mdata->spi_hclk);
+ } else {
clk_disable_unprepare(mdata->spi_clk);
+ if (!IS_ERR(mdata->spi_hclk))
+ clk_disable_unprepare(mdata->spi_hclk);
+ }

return 0;
}
@@ -1359,13 +1400,25 @@ static int mtk_spi_runtime_resume(struct device *dev)
struct mtk_spi *mdata = spi_master_get_devdata(master);
int ret;

- if (mdata->dev_comp->no_need_unprepare)
+ if (mdata->dev_comp->no_need_unprepare) {
ret = clk_enable(mdata->spi_clk);
- else
+ if (!IS_ERR(mdata->spi_hclk))
+ clk_enable(mdata->spi_hclk);
+ } else {
ret = clk_prepare_enable(mdata->spi_clk);
- if (ret < 0) {
- dev_err(dev, "failed to enable spi_clk (%d)\n", ret);
- return ret;
+ if (ret < 0) {
+ dev_err(dev, "failed to enable spi_clk (%d)\n", ret);
+ return ret;
+ }
+
+ if (!IS_ERR(mdata->spi_hclk)) {
+ ret = clk_prepare_enable(mdata->spi_hclk);
+ if (ret < 0) {
+ dev_err(dev, "failed to enable spi_hclk (%d)\n", ret);
+ clk_disable_unprepare(mdata->spi_clk);
+ return ret;
+ }
+ }
}

return 0;
--
2.25.1
\
 
 \ /
  Last update: 2022-03-07 07:53    [W:0.091 / U:0.356 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site