hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dmaengine: stm32-dmamux: driver defers probe for clock and reset 

Changes STM32 DMAMUX driver to defer its probe operation when
reset controller is expected but has not been probed yet.

Changes error traces when failing to get a system resource so that
it is not printed on failure with deferred probing.

Signed-off-by: Etienne Carriere <etienne.carriere@st.com>
Signed-off-by: Amelie Delaunay <amelie.delaunay@st.com>
Link: https://lore.kernel.org/r/20200128094158.20361-5-amelie.delaunay@st.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Etienne Carriere 2020-01-28 10:41:58 +01:00 committed by Vinod Koul
parent d04d2f620d
commit 6cc7089764
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/dma/stm32-dmamux.c
View File

@ -254,8 +254,8 @@ static int stm32_dmamux_probe(struct platform_device *pdev)
stm32_dmamux->clk = devm_clk_get(&pdev->dev, NULL); stm32_dmamux->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(stm32_dmamux->clk)) { if (IS_ERR(stm32_dmamux->clk)) {
ret = PTR_ERR(stm32_dmamux->clk); ret = PTR_ERR(stm32_dmamux->clk);
if (ret == -EPROBE_DEFER) if (ret != -EPROBE_DEFER)
dev_info(&pdev->dev, "Missing controller clock\n"); dev_err(&pdev->dev, "Missing clock controller\n");
return ret; return ret;
} }
@ -266,7 +266,11 @@ static int stm32_dmamux_probe(struct platform_device *pdev)
} }
rst = devm_reset_control_get(&pdev->dev, NULL); rst = devm_reset_control_get(&pdev->dev, NULL);
if (!IS_ERR(rst)) { if (IS_ERR(rst)) {
ret = PTR_ERR(rst);
if (ret == -EPROBE_DEFER)
goto err_clk;
} else {
reset_control_assert(rst); reset_control_assert(rst);
udelay(2); udelay(2);
reset_control_deassert(rst); reset_control_deassert(rst);
@ -291,7 +295,12 @@ static int stm32_dmamux_probe(struct platform_device *pdev)
ret = of_dma_router_register(node, stm32_dmamux_route_allocate, ret = of_dma_router_register(node, stm32_dmamux_route_allocate,
&stm32_dmamux->dmarouter); &stm32_dmamux->dmarouter);
if (ret) if (ret)
clk_disable_unprepare(stm32_dmamux->clk); goto err_clk;
return 0;
err_clk:
clk_disable_unprepare(stm32_dmamux->clk);
return ret; return ret;
} }