blob: 02e460a388b6c167dfc547d62beb74f5de7ec8f7 [file] [log] [blame]
developer5d148cb2023-06-02 13:08:11 +08001From 1a41f923f66c03c40e6703dd69f8bfbe2791ce70 Mon Sep 17 00:00:00 2001
2From: Sam Shih <sam.shih@mediatek.com>
3Date: Fri, 2 Jun 2023 13:06:19 +0800
4Subject: [PATCH]
5 [spi-and-storage][999-2365-fix-SPIM-NAND-and-NOR-probing.patch]
6
7---
8 drivers/spi/spi-mt65xx.c | 10 +++++-----
9 1 file changed, 5 insertions(+), 5 deletions(-)
10
11diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c
12index 3a8f67f1e..05697e1d1 100644
13--- a/drivers/spi/spi-mt65xx.c
14+++ b/drivers/spi/spi-mt65xx.c
15@@ -1072,7 +1072,7 @@ static int mtk_spi_probe(struct platform_device *pdev)
16 goto err_put_master;
17 }
18
19-/*
20+
21 mdata->parent_clk = devm_clk_get(&pdev->dev, "parent-clk");
22 if (IS_ERR(mdata->parent_clk)) {
23 ret = PTR_ERR(mdata->parent_clk);
24@@ -1100,17 +1100,17 @@ static int mtk_spi_probe(struct platform_device *pdev)
25 goto err_put_master;
26 }
27
28- ret = clk_set_parent(mdata->sel_clk, mdata->parent_clk);
29+ /*ret = clk_set_parent(mdata->sel_clk, mdata->parent_clk);
30 if (ret < 0) {
31 dev_err(&pdev->dev, "failed to clk_set_parent (%d)\n", ret);
32 clk_disable_unprepare(mdata->spi_clk);
33 goto err_put_master;
34 }
35
36- clk_disable_unprepare(mdata->spi_clk);
37+ clk_disable_unprepare(mdata->sel_clk);*/
38+
39+ //pm_runtime_enable(&pdev->dev);
40
41- pm_runtime_enable(&pdev->dev);
42-*/
43 ret = devm_spi_register_master(&pdev->dev, master);
44 if (ret) {
45 dev_err(&pdev->dev, "failed to register master (%d)\n", ret);
46--
472.34.1
48