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

Commit a15636e8 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Vinod Koul
Browse files

dmaengine: dw: move clock operations to platform.c 



On BayTrail platform DMA is not functional in the PCI mode, whereby it always
failed and exit at the point when it tries to get a clock. It causes the PCI
mode probe to exit with the error message:
	dw_dmac_pci: probe of 0000:00:1e.0 failed with error -2

This patch moves clock operations to where it belongs to. Thus, the clock is
provided only in ACPI / non-PCI cases.

Reported-by: default avatarChew, Chiau Ee <chiau.ee.chew@intel.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 4d130de2

drivers/dma/dw/core.c

+0 −16
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
 */



#include <linux/bitops.h>

#include <linux/clk.h>

#include <linux/delay.h>

#include <linux/dmaengine.h>

#include <linux/dma-mapping.h>
@@ -1488,13 +1487,6 @@ int dw_dma_probe(struct dw_dma_chip *chip, struct dw_dma_platform_data *pdata) 
	dw->regs = chip->regs;

	chip->dw = dw;



	dw->clk = devm_clk_get(chip->dev, "hclk");

	if (IS_ERR(dw->clk))

		return PTR_ERR(dw->clk);

	err = clk_prepare_enable(dw->clk);

	if (err)

		return err;



	dw_params = dma_read_byaddr(chip->regs, DW_PARAMS);

	autocfg = dw_params >> DW_PARAMS_EN & 0x1;
@@ -1665,7 +1657,6 @@ int dw_dma_probe(struct dw_dma_chip *chip, struct dw_dma_platform_data *pdata) 
err_dma_register:

	free_irq(chip->irq, dw);

err_pdata:

	clk_disable_unprepare(dw->clk);

	return err;

}

EXPORT_SYMBOL_GPL(dw_dma_probe);
@@ -1687,8 +1678,6 @@ int dw_dma_remove(struct dw_dma_chip *chip) 
		channel_clear_bit(dw, CH_EN, dwc->mask);

	}



	clk_disable_unprepare(dw->clk);



	return 0;

}

EXPORT_SYMBOL_GPL(dw_dma_remove);
@@ -1698,7 +1687,6 @@ void dw_dma_shutdown(struct dw_dma_chip *chip) 
	struct dw_dma *dw = chip->dw;



	dw_dma_off(dw);

	clk_disable_unprepare(dw->clk);

}

EXPORT_SYMBOL_GPL(dw_dma_shutdown);
@@ -1709,8 +1697,6 @@ int dw_dma_suspend(struct dw_dma_chip *chip) 
	struct dw_dma *dw = chip->dw;



	dw_dma_off(dw);

	clk_disable_unprepare(dw->clk);



	return 0;

}

EXPORT_SYMBOL_GPL(dw_dma_suspend);
@@ -1719,9 +1705,7 @@ int dw_dma_resume(struct dw_dma_chip *chip) 
{

	struct dw_dma *dw = chip->dw;



	clk_prepare_enable(dw->clk);

	dma_writel(dw, CFG, DW_CFG_DMA_EN);



	return 0;

}

EXPORT_SYMBOL_GPL(dw_dma_resume);

drivers/dma/dw/internal.h

+2 −0
Original line number Diff line number Diff line
@@ -21,12 +21,14 @@ 
 * @dev:		struct device of the DMA controller

 * @irq:		irq line

 * @regs:		memory mapped I/O space

 * @clk:		hclk clock

 * @dw:			struct dw_dma that is filed by dw_dma_probe()

 */

struct dw_dma_chip {

	struct device	*dev;

	int		irq;

	void __iomem	*regs;

	struct clk	*clk;

	struct dw_dma	*dw;

};

drivers/dma/dw/platform.c

+22 −3
Original line number Diff line number Diff line
@@ -178,10 +178,17 @@ static int dw_probe(struct platform_device *pdev) 


	chip->dev = dev;



	err = dw_dma_probe(chip, pdata);

	chip->clk = devm_clk_get(chip->dev, "hclk");

	if (IS_ERR(chip->clk))

		return PTR_ERR(chip->clk);

	err = clk_prepare_enable(chip->clk);

	if (err)

		return err;



	err = dw_dma_probe(chip, pdata);

	if (err)

		goto err_dw_dma_probe;



	platform_set_drvdata(pdev, chip);



	if (pdev->dev.of_node) {
@@ -196,6 +203,10 @@ static int dw_probe(struct platform_device *pdev) 
		dw_dma_acpi_controller_register(chip->dw);



	return 0;



err_dw_dma_probe:

	clk_disable_unprepare(chip->clk);

	return err;

}



static int dw_remove(struct platform_device *pdev)
@@ -205,7 +216,10 @@ static int dw_remove(struct platform_device *pdev) 
	if (pdev->dev.of_node)

		of_dma_controller_free(pdev->dev.of_node);



	return dw_dma_remove(chip);

	dw_dma_remove(chip);

	clk_disable_unprepare(chip->clk);



	return 0;

}



static void dw_shutdown(struct platform_device *pdev)
@@ -213,6 +227,7 @@ static void dw_shutdown(struct platform_device *pdev) 
	struct dw_dma_chip *chip = platform_get_drvdata(pdev);



	dw_dma_shutdown(chip);

	clk_disable_unprepare(chip->clk);

}



#ifdef CONFIG_OF
@@ -238,7 +253,10 @@ static int dw_suspend_late(struct device *dev) 
	struct platform_device *pdev = to_platform_device(dev);

	struct dw_dma_chip *chip = platform_get_drvdata(pdev);



	return dw_dma_suspend(chip);

	dw_dma_suspend(chip);

	clk_disable_unprepare(chip->clk);



	return 0;

}



static int dw_resume_early(struct device *dev)
@@ -246,6 +264,7 @@ static int dw_resume_early(struct device *dev) 
	struct platform_device *pdev = to_platform_device(dev);

	struct dw_dma_chip *chip = platform_get_drvdata(pdev);



	clk_prepare_enable(chip->clk);

	return dw_dma_resume(chip);

}

drivers/dma/dw/regs.h

+0 −1
Original line number Diff line number Diff line
@@ -251,7 +251,6 @@ struct dw_dma { 
	void __iomem		*regs;

	struct dma_pool		*desc_pool;

	struct tasklet_struct	tasklet;

	struct clk		*clk;



	/* channels */

	struct dw_dma_chan	*chan;