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

Commit 7cfa7b54 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/dma' into for-tiwai

parents 99896f71 d70e861a

drivers/dma/pl330.c

+1 −0
Original line number Diff line number Diff line
@@ -2884,6 +2884,7 @@ static int pl330_dma_device_slave_caps(struct dma_chan *dchan, 
	caps->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);

	caps->cmd_pause = false;

	caps->cmd_terminate = true;

	caps->residue_granularity = DMA_RESIDUE_GRANULARITY_DESCRIPTOR;



	return 0;

}

include/linux/dmaengine.h

+28 −0
Original line number Diff line number Diff line
@@ -364,6 +364,32 @@ struct dma_slave_config { 
	unsigned int slave_id;

};



/**

 * enum dma_residue_granularity - Granularity of the reported transfer residue

 * @DMA_RESIDUE_GRANULARITY_DESCRIPTOR: Residue reporting is not support. The

 *  DMA channel is only able to tell whether a descriptor has been completed or

 *  not, which means residue reporting is not supported by this channel. The

 *  residue field of the dma_tx_state field will always be 0.

 * @DMA_RESIDUE_GRANULARITY_SEGMENT: Residue is updated after each successfully

 *  completed segment of the transfer (For cyclic transfers this is after each

 *  period). This is typically implemented by having the hardware generate an

 *  interrupt after each transferred segment and then the drivers updates the

 *  outstanding residue by the size of the segment. Another possibility is if

 *  the hardware supports scatter-gather and the segment descriptor has a field

 *  which gets set after the segment has been completed. The driver then counts

 *  the number of segments without the flag set to compute the residue.

 * @DMA_RESIDUE_GRANULARITY_BURST: Residue is updated after each transferred

 *  burst. This is typically only supported if the hardware has a progress

 *  register of some sort (E.g. a register with the current read/write address

 *  or a register with the amount of bursts/beats/bytes that have been

 *  transferred or still need to be transferred).

 */

enum dma_residue_granularity {

	DMA_RESIDUE_GRANULARITY_DESCRIPTOR = 0,

	DMA_RESIDUE_GRANULARITY_SEGMENT = 1,

	DMA_RESIDUE_GRANULARITY_BURST = 2,

};



/* struct dma_slave_caps - expose capabilities of a slave channel only

 *

 * @src_addr_widths: bit mask of src addr widths the channel supports
@@ -374,6 +400,7 @@ struct dma_slave_config { 
 * 	should be checked by controller as well

 * @cmd_pause: true, if pause and thereby resume is supported

 * @cmd_terminate: true, if terminate cmd is supported

 * @residue_granularity: granularity of the reported transfer residue

 */

struct dma_slave_caps {

	u32 src_addr_widths;
@@ -381,6 +408,7 @@ struct dma_slave_caps { 
	u32 directions;

	bool cmd_pause;

	bool cmd_terminate;

	enum dma_residue_granularity residue_granularity;

};



static inline const char *dma_chan_name(struct dma_chan *chan)

sound/soc/adi/axi-i2s.c

+1 −2
Original line number Diff line number Diff line
@@ -236,8 +236,7 @@ static int axi_i2s_probe(struct platform_device *pdev) 
	if (ret)

		goto err_clk_disable;



	ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL,

			SND_DMAENGINE_PCM_FLAG_NO_RESIDUE);

	ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);

	if (ret)

		goto err_clk_disable;

sound/soc/adi/axi-spdif.c

+1 −2
Original line number Diff line number Diff line
@@ -229,8 +229,7 @@ static int axi_spdif_probe(struct platform_device *pdev) 
	if (ret)

		goto err_clk_disable;



	ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL,

			SND_DMAENGINE_PCM_FLAG_NO_RESIDUE);

	ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);

	if (ret)

		goto err_clk_disable;

sound/soc/samsung/dmaengine.c

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ int samsung_asoc_dma_platform_register(struct device *dev) 
{

	return snd_dmaengine_pcm_register(dev, &samsung_dmaengine_pcm_config,

					  SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME |

					  SND_DMAENGINE_PCM_FLAG_NO_RESIDUE |

					  SND_DMAENGINE_PCM_FLAG_COMPAT);

}

EXPORT_SYMBOL_GPL(samsung_asoc_dma_platform_register);