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

Commit 6d8f7abd authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Vinod Koul
Browse files

dmaengine: mv_xor: remove support for dmacap,* DT properties 



The only reason why we had dmacap,* properties is because back when
DMA_MEMSET was supported, only one out of the two channels per engine
could do a memset operation. But this is something that the driver
already knows anyway, and since then, the DMA_MEMSET support has been
removed.

The driver is already well aware of what each channel supports and the
one to one mapping between Linux specific implementation details (such
as dmacap,interrupt enabling DMA_INTERRUPT) and DT properties is a
good indication that these DT properties are wrong.

Therefore, this commit simply gets rid of these dmacap,* properties,
they are now ignored, and the driver is responsible for knowing the
capabilities of the hardware with regard to the dmaengine subsystem
expectations.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 31495d60

Documentation/devicetree/bindings/dma/mv-xor.txt

+4 −6
Original line number Diff line number Diff line
@@ -12,10 +12,13 @@ XOR engine has. Those sub-nodes have the following required 
properties:

- interrupts: interrupt of the XOR channel



And the following optional properties:

The sub-nodes used to contain one or several of the following

properties, but they are now deprecated:

- dmacap,memcpy to indicate that the XOR channel is capable of memcpy operations

- dmacap,memset to indicate that the XOR channel is capable of memset operations

- dmacap,xor to indicate that the XOR channel is capable of xor operations

- dmacap,interrupt to indicate that the XOR channel is capable of

  generating interrupts



Example:
@@ -28,13 +31,8 @@ xor@d0060900 { 


	xor00 {

	      interrupts = <51>;

	      dmacap,memcpy;

	      dmacap,xor;

	};

	xor01 {

	      interrupts = <52>;

	      dmacap,memcpy;

	      dmacap,xor;

	      dmacap,memset;

	};

};

drivers/dma/mv_xor.c

+3 −6
Original line number Diff line number Diff line
@@ -1190,11 +1190,8 @@ static int mv_xor_probe(struct platform_device *pdev) 
			op_in_desc = (int)of_id->data;



			dma_cap_zero(cap_mask);

			if (of_property_read_bool(np, "dmacap,memcpy"))

			dma_cap_set(DMA_MEMCPY, cap_mask);

			if (of_property_read_bool(np, "dmacap,xor"))

			dma_cap_set(DMA_XOR, cap_mask);

			if (of_property_read_bool(np, "dmacap,interrupt"))

			dma_cap_set(DMA_INTERRUPT, cap_mask);



			irq = irq_of_parse_and_map(np, 0);