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

Commit ac75a50b authored by Robert Jarzmik's avatar Robert Jarzmik
Browse files

mtd: rawnand: marvell: remove the dmaengine compat need 



As the pxa architecture switched towards the dmaengine slave map, the
old compatibility mechanism to acquire the dma requestor line number and
priority are not needed anymore.

This patch simplifies the dma resource acquisition, using the more
generic function dma_request_slave_channel().

Signed-off-by: default avatarDaniel Mack <daniel@zonque.org>
Signed-off-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Acked-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent f727b6cd

drivers/mtd/nand/raw/marvell_nand.c

+1 −16
Original line number Diff line number Diff line
@@ -2612,8 +2612,6 @@ static int marvell_nfc_init_dma(struct marvell_nfc *nfc) 
						    dev);

	struct dma_slave_config config = {};

	struct resource *r;

	dma_cap_mask_t mask;

	struct pxad_param param;

	int ret;



	if (!IS_ENABLED(CONFIG_PXA_DMA)) {
@@ -2626,20 +2624,7 @@ static int marvell_nfc_init_dma(struct marvell_nfc *nfc) 
	if (ret)

		return ret;



	r = platform_get_resource(pdev, IORESOURCE_DMA, 0);

	if (!r) {

		dev_err(nfc->dev, "No resource defined for data DMA\n");

		return -ENXIO;

	}



	param.drcmr = r->start;

	param.prio = PXAD_PRIO_LOWEST;

	dma_cap_zero(mask);

	dma_cap_set(DMA_SLAVE, mask);

	nfc->dma_chan =

		dma_request_slave_channel_compat(mask, pxad_filter_fn,

						 &param, nfc->dev,

						 "data");

	nfc->dma_chan =	dma_request_slave_channel(nfc->dev, "data");

	if (!nfc->dma_chan) {

		dev_err(nfc->dev,

			"Unable to request data DMA channel\n");