Commit 57e9f366 authored by Etienne Carriere's avatar Etienne Carriere Committed by Vinod Koul

dmaengine: stm32-dmamux: fix clock handling in probe sequence

This change ensures the DMAMUX device is reset only once it is clocked
and that clock is released in a safe state when probe operation fails.
Signed-off-by: default avatarEtienne Carriere <etienne.carriere@st.com>
Signed-off-by: default avatarAmelie Delaunay <amelie.delaunay@st.com>
Link: https://lore.kernel.org/r/20200128094158.20361-3-amelie.delaunay@st.comSigned-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent f65c2e14
...@@ -259,6 +259,12 @@ static int stm32_dmamux_probe(struct platform_device *pdev) ...@@ -259,6 +259,12 @@ static int stm32_dmamux_probe(struct platform_device *pdev)
return ret; return ret;
} }
ret = clk_prepare_enable(stm32_dmamux->clk);
if (ret < 0) {
dev_err(&pdev->dev, "clk_prep_enable error: %d\n", ret);
return ret;
}
stm32_dmamux->rst = devm_reset_control_get(&pdev->dev, NULL); stm32_dmamux->rst = devm_reset_control_get(&pdev->dev, NULL);
if (!IS_ERR(stm32_dmamux->rst)) { if (!IS_ERR(stm32_dmamux->rst)) {
reset_control_assert(stm32_dmamux->rst); reset_control_assert(stm32_dmamux->rst);
...@@ -274,14 +280,6 @@ static int stm32_dmamux_probe(struct platform_device *pdev) ...@@ -274,14 +280,6 @@ static int stm32_dmamux_probe(struct platform_device *pdev)
pm_runtime_set_active(&pdev->dev); pm_runtime_set_active(&pdev->dev);
pm_runtime_enable(&pdev->dev); pm_runtime_enable(&pdev->dev);
if (!IS_ERR(stm32_dmamux->clk)) {
ret = clk_prepare_enable(stm32_dmamux->clk);
if (ret < 0) {
dev_err(&pdev->dev, "clk_prep_enable error: %d\n", ret);
return ret;
}
}
pm_runtime_get_noresume(&pdev->dev); pm_runtime_get_noresume(&pdev->dev);
/* Reset the dmamux */ /* Reset the dmamux */
...@@ -290,8 +288,12 @@ static int stm32_dmamux_probe(struct platform_device *pdev) ...@@ -290,8 +288,12 @@ static int stm32_dmamux_probe(struct platform_device *pdev)
pm_runtime_put(&pdev->dev); pm_runtime_put(&pdev->dev);
return 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)
clk_disable_unprepare(stm32_dmamux->clk);
return ret;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment