spi: mediatek: fix spi clock usage error

spi clock manages flow:
  CLK_TOP_SYSPLL3_D2 ---> CLK_TOP_SPI_SEL ---> CLK_PERI_SPI0
     (source clock)           (clock mux)       (clock gate)
spi driver should choose source clock by clock mux, then enable
clock gate.

Signed-off-by: Leilk Liu <leilk.liu@mediatek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

1 files changed, 15 insertions, 8 deletions

diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c
index b609b1cbdcba..6fbb5e5132b0 100644
--- a/drivers/spi/spi-mt65xx.c
+++ b/drivers/spi/spi-mt65xx.c
@@ -85,7 +85,7 @@ struct mtk_spi {
         void __iomem *base;
         u32 state;
         u32 pad_sel;
-        struct clk *spi_clk, *parent_clk;
+        struct clk *parent_clk, *sel_clk, *spi_clk;
         struct spi_transfer *cur_transfer;
         u32 xfer_len;
         struct scatterlist *tx_sgl, *rx_sgl;
@@ -576,17 +576,24 @@ static int mtk_spi_probe(struct platform_device *pdev)
                 goto err_put_master;
         }
 
-        mdata->spi_clk = devm_clk_get(&pdev->dev, "spi-clk");
-        if (IS_ERR(mdata->spi_clk)) {
+        mdata->parent_clk = devm_clk_get(&pdev->dev, "parent-clk");
+        if (IS_ERR(mdata->parent_clk)) {
+                ret = PTR_ERR(mdata->parent_clk);
+                dev_err(&pdev->dev, "failed to get parent-clk: %d\n", ret);
+                goto err_put_master;
+        }
+
+        mdata->sel_clk = devm_clk_get(&pdev->dev, "sel-clk");
+        if (IS_ERR(mdata->sel_clk)) {
                 ret = PTR_ERR(mdata->spi_clk);
-                dev_err(&pdev->dev, "failed to get spi-clk: %d\n", ret);
+                dev_err(&pdev->dev, "failed to get sel-clk: %d\n", ret);
                 goto err_put_master;
         }
 
-        mdata->parent_clk = devm_clk_get(&pdev->dev, "parent-clk");
-        if (IS_ERR(mdata->parent_clk)) {
+        mdata->spi_clk = devm_clk_get(&pdev->dev, "spi-clk");
+        if (IS_ERR(mdata->spi_clk)) {
                 ret = PTR_ERR(mdata->parent_clk);
-                dev_err(&pdev->dev, "failed to get parent-clk: %d\n", ret);
+                dev_err(&pdev->dev, "failed to get spi-clk: %d\n", ret);
                 goto err_put_master;
         }
 
@@ -596,7 +603,7 @@ static int mtk_spi_probe(struct platform_device *pdev)
                 goto err_put_master;
         }
 
-        ret = clk_set_parent(mdata->spi_clk, mdata->parent_clk);
+        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);
                 goto err_disable_clk;