aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorChen-Yu Tsai <wens@csie.org>2014-09-06 06:47:28 -0400
committerVinod Koul <vinod.koul@intel.com>2014-09-24 01:28:27 -0400
commit14e0e2833d44f61cb8168d04e979a2bfbc0f4bfb (patch)
tree01dcb2aa33774db2b927ec3296542fb54b98b740 /drivers/dma
parent50cf5534df852d30f1fd07030c2084b708a88308 (diff)
dmaengine: sun6i: Remove obsolete clk muxing code
The sun6i DMA controller requires the AHB1 bus clock to be clocked from PLL6. This was originally done by the dmaengine driver during probe time. The AHB1 clock driver has since been unified, so the original code does not work. Remove the clk muxing code, and replace it with DT clk default properties. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/sun6i-dma.c23
1 files changed, 0 insertions, 23 deletions
diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c
index 1f92a56fd2b6..3aa10b328254 100644
--- a/drivers/dma/sun6i-dma.c
+++ b/drivers/dma/sun6i-dma.c
@@ -862,7 +862,6 @@ static int sun6i_dma_probe(struct platform_device *pdev)
862{ 862{
863 struct sun6i_dma_dev *sdc; 863 struct sun6i_dma_dev *sdc;
864 struct resource *res; 864 struct resource *res;
865 struct clk *mux, *pll6;
866 int ret, i; 865 int ret, i;
867 866
868 sdc = devm_kzalloc(&pdev->dev, sizeof(*sdc), GFP_KERNEL); 867 sdc = devm_kzalloc(&pdev->dev, sizeof(*sdc), GFP_KERNEL);
@@ -886,28 +885,6 @@ static int sun6i_dma_probe(struct platform_device *pdev)
886 return PTR_ERR(sdc->clk); 885 return PTR_ERR(sdc->clk);
887 } 886 }
888 887
889 mux = clk_get(NULL, "ahb1_mux");
890 if (IS_ERR(mux)) {
891 dev_err(&pdev->dev, "Couldn't get AHB1 Mux\n");
892 return PTR_ERR(mux);
893 }
894
895 pll6 = clk_get(NULL, "pll6");
896 if (IS_ERR(pll6)) {
897 dev_err(&pdev->dev, "Couldn't get PLL6\n");
898 clk_put(mux);
899 return PTR_ERR(pll6);
900 }
901
902 ret = clk_set_parent(mux, pll6);
903 clk_put(pll6);
904 clk_put(mux);
905
906 if (ret) {
907 dev_err(&pdev->dev, "Couldn't reparent AHB1 on PLL6\n");
908 return ret;
909 }
910
911 sdc->rstc = devm_reset_control_get(&pdev->dev, NULL); 888 sdc->rstc = devm_reset_control_get(&pdev->dev, NULL);
912 if (IS_ERR(sdc->rstc)) { 889 if (IS_ERR(sdc->rstc)) {
913 dev_err(&pdev->dev, "No reset controller specified\n"); 890 dev_err(&pdev->dev, "No reset controller specified\n");