Commit b377e670 authored by Alexandru Ardelean's avatar Alexandru Ardelean Committed by Vinod Koul
Browse files

dmaengine: axi-dmac: move version read in probe 



The 'version' of the IP core will be needed to adapt the driver to a new
feature (i.e. reading some DMA parameters from registers).
To do that, the version will be checked, so this is being moved out of the
axi_dmac_detect_caps() function.

Signed-off-by: default avatarAlexandru Ardelean <alexandru.ardelean@analog.com>
Link: https://lore.kernel.org/r/20200825151950.57605-2-alexandru.ardelean@analog.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 112ec61b

drivers/dma/dma-axi-dmac.c

+5 −5
Original line number Diff line number Diff line
@@ -774,12 +774,9 @@ static int axi_dmac_parse_chan_dt(struct device_node *of_chan, 
	return 0;

}



static int axi_dmac_detect_caps(struct axi_dmac *dmac)

static int axi_dmac_detect_caps(struct axi_dmac *dmac, unsigned int version)

{

	struct axi_dmac_chan *chan = &dmac->chan;

	unsigned int version;



	version = axi_dmac_read(dmac, ADI_AXI_REG_VERSION);



	axi_dmac_write(dmac, AXI_DMAC_REG_FLAGS, AXI_DMAC_FLAG_CYCLIC);

	if (axi_dmac_read(dmac, AXI_DMAC_REG_FLAGS) == AXI_DMAC_FLAG_CYCLIC)
@@ -831,6 +828,7 @@ static int axi_dmac_probe(struct platform_device *pdev) 
	struct axi_dmac *dmac;

	struct resource *res;

	struct regmap *regmap;

	unsigned int version;

	int ret;



	dmac = devm_kzalloc(&pdev->dev, sizeof(*dmac), GFP_KERNEL);
@@ -898,7 +896,9 @@ static int axi_dmac_probe(struct platform_device *pdev) 
	if (ret < 0)

		return ret;



	ret = axi_dmac_detect_caps(dmac);

	version = axi_dmac_read(dmac, ADI_AXI_REG_VERSION);



	ret = axi_dmac_detect_caps(dmac, version);

	if (ret)

		goto err_clk_disable;