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

dmaengine: dw: Remove unused internal property 



All known devices, which use DT for configuration, support
memory-to-memory transfers. So enable it by default.

The rest two cases, i.e. Intel Quark and PPC460ex, instantiate DMA driver and
use its channels exclusively for hardware, which means there is no available
channel for any other purposes anyway.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent d7dba6be

drivers/dma/dw/core.c

+1 −3
Original line number Diff line number Diff line
@@ -1227,7 +1227,6 @@ int dw_dma_probe(struct dw_dma_chip *chip) 
		pdata->block_size = dma_readl(dw, MAX_BLK_SIZE);



		/* Fill platform data with the default values */

		pdata->is_memcpy = true;

		pdata->chan_allocation_order = CHAN_ALLOCATION_ASCENDING;

		pdata->chan_priority = CHAN_PRIORITY_ASCENDING;

	} else if (chip->pdata->nr_channels > DW_DMA_MAX_NR_CHANNELS) {
@@ -1340,7 +1339,6 @@ int dw_dma_probe(struct dw_dma_chip *chip) 
	/* Set capabilities */

	dma_cap_set(DMA_SLAVE, dw->dma.cap_mask);

	dma_cap_set(DMA_PRIVATE, dw->dma.cap_mask);

	if (pdata->is_memcpy)

	dma_cap_set(DMA_MEMCPY, dw->dma.cap_mask);



	dw->dma.dev = chip->dev;

drivers/dma/dw/pci.c

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 


static struct dw_dma_platform_data mrfld_pdata = {

	.nr_channels = 8,

	.is_memcpy = true,

	.is_idma32 = true,

	.chan_allocation_order = CHAN_ALLOCATION_ASCENDING,

	.chan_priority = CHAN_PRIORITY_ASCENDING,

drivers/dma/dw/platform.c

+0 −6
Original line number Diff line number Diff line
@@ -128,12 +128,6 @@ dw_dma_parse_dt(struct platform_device *pdev) 
	pdata->nr_masters = nr_masters;

	pdata->nr_channels = nr_channels;



	/*

	 * All known devices, which use DT for configuration, support

	 * memory-to-memory transfers. So enable it by default.

	 */

	pdata->is_memcpy = true;



	if (!of_property_read_u32(np, "chan_allocation_order", &tmp))

		pdata->chan_allocation_order = (unsigned char)tmp;

include/linux/platform_data/dma-dw.h

+0 −2
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ struct dw_dma_slave { 
/**

 * struct dw_dma_platform_data - Controller configuration parameters

 * @nr_channels: Number of channels supported by hardware (max 8)

 * @is_memcpy: The device channels do support memory-to-memory transfers.

 * @is_idma32: The type of the DMA controller is iDMA32

 * @chan_allocation_order: Allocate channels starting from 0 or 7

 * @chan_priority: Set channel priority increasing from 0 to 7 or 7 to 0.
@@ -51,7 +50,6 @@ struct dw_dma_slave { 
 */

struct dw_dma_platform_data {

	unsigned int	nr_channels;

	bool		is_memcpy;

	bool		is_idma32;

#define CHAN_ALLOCATION_ASCENDING	0	/* zero to seven */

#define CHAN_ALLOCATION_DESCENDING	1	/* seven to zero */

CRA Git | Maintained and supported by SUSTech CRA and CCSE