diff options
author | Ivan T. Ivanov <ivan.ivanov@linaro.org> | 2015-09-03 18:02:29 +0300 |
---|---|---|
committer | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2016-07-05 14:06:39 +0100 |
commit | 880b9db916a600797c9cdbe706cf68ba2dca7bf9 (patch) | |
tree | af52abdcfc50fa374c552e44d8a94874ddbafbbb | |
parent | 59001c1289a42e502c93be58e85eda437198613a (diff) |
dmaengine: adm: Don't reset controller during probe
TODO: check this.
-rw-r--r-- | drivers/dma/qcom_adm.c | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/drivers/dma/qcom_adm.c b/drivers/dma/qcom_adm.c index 56d678b5379f7..e46c3cbf01a75 100644 --- a/drivers/dma/qcom_adm.c +++ b/drivers/dma/qcom_adm.c @@ -26,7 +26,6 @@ #include <linux/of_address.h> #include <linux/of_irq.h> #include <linux/of_dma.h> -#include <linux/reset.h> #include <linux/clk.h> #include <linux/dmaengine.h> @@ -171,10 +170,6 @@ struct adm_device { struct clk *core_clk; struct clk *iface_clk; - struct reset_control *clk_reset; - struct reset_control *c0_reset; - struct reset_control *c1_reset; - struct reset_control *c2_reset; int irq; }; @@ -734,44 +729,6 @@ static int adm_dma_probe(struct platform_device *pdev) goto err_disable_core_clk; } - adev->clk_reset = devm_reset_control_get(&pdev->dev, "clk"); - if (IS_ERR(adev->clk_reset)) { - dev_err(adev->dev, "failed to get ADM0 reset\n"); - ret = PTR_ERR(adev->clk_reset); - goto err_disable_clks; - } - - adev->c0_reset = devm_reset_control_get(&pdev->dev, "c0"); - if (IS_ERR(adev->c0_reset)) { - dev_err(adev->dev, "failed to get ADM0 C0 reset\n"); - ret = PTR_ERR(adev->c0_reset); - goto err_disable_clks; - } - - adev->c1_reset = devm_reset_control_get(&pdev->dev, "c1"); - if (IS_ERR(adev->c1_reset)) { - dev_err(adev->dev, "failed to get ADM0 C1 reset\n"); - ret = PTR_ERR(adev->c1_reset); - goto err_disable_clks; - } - - adev->c2_reset = devm_reset_control_get(&pdev->dev, "c2"); - if (IS_ERR(adev->c2_reset)) { - dev_err(adev->dev, "failed to get ADM0 C2 reset\n"); - ret = PTR_ERR(adev->c2_reset); - goto err_disable_clks; - } - - reset_control_assert(adev->clk_reset); - reset_control_assert(adev->c0_reset); - reset_control_assert(adev->c1_reset); - reset_control_assert(adev->c2_reset); - - reset_control_deassert(adev->clk_reset); - reset_control_deassert(adev->c0_reset); - reset_control_deassert(adev->c1_reset); - reset_control_deassert(adev->c2_reset); - adev->channels = devm_kcalloc(adev->dev, ADM_MAX_CHANNELS, sizeof(*adev->channels), GFP_KERNEL); |