Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14e0e283 authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Vinod Koul
Browse files

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: default avatarChen-Yu Tsai <wens@csie.org>
Acked-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 50cf5534

drivers/dma/sun6i-dma.c

+0 −23
Original line number Diff line number Diff line
@@ -862,7 +862,6 @@ static int sun6i_dma_probe(struct platform_device *pdev) 
{

	struct sun6i_dma_dev *sdc;

	struct resource *res;

	struct clk *mux, *pll6;

	int ret, i;



	sdc = devm_kzalloc(&pdev->dev, sizeof(*sdc), GFP_KERNEL);
@@ -886,28 +885,6 @@ static int sun6i_dma_probe(struct platform_device *pdev) 
		return PTR_ERR(sdc->clk);

	}



	mux = clk_get(NULL, "ahb1_mux");

	if (IS_ERR(mux)) {

		dev_err(&pdev->dev, "Couldn't get AHB1 Mux\n");

		return PTR_ERR(mux);

	}



	pll6 = clk_get(NULL, "pll6");

	if (IS_ERR(pll6)) {

		dev_err(&pdev->dev, "Couldn't get PLL6\n");

		clk_put(mux);

		return PTR_ERR(pll6);

	}



	ret = clk_set_parent(mux, pll6);

	clk_put(pll6);

	clk_put(mux);



	if (ret) {

		dev_err(&pdev->dev, "Couldn't reparent AHB1 on PLL6\n");

		return ret;

	}



	sdc->rstc = devm_reset_control_get(&pdev->dev, NULL);

	if (IS_ERR(sdc->rstc)) {

		dev_err(&pdev->dev, "No reset controller specified\n");