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

Commit 6b45c1ee authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by David Woodhouse
Browse files

mtd: nand: pxa3xx: Allow devices with no dma resources 



When use_dma=0 there's no point in requesting resources for dma,
since they won't be used anyway. Therefore we remove that requirement,
therefore allowing devices without dma to pass the driver probe.

Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Tested-by: default avatarDaniel Mack <zonque@gmail.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 57ff88f0

drivers/mtd/nand/pxa3xx_nand.c

+28 −23
Original line number Diff line number Diff line
@@ -1141,18 +1141,21 @@ static int alloc_nand_resource(struct platform_device *pdev) 
	if (ret < 0)

		return ret;



	if (use_dma) {

		/*

	 * This is a dirty hack to make this driver work from devicetree

	 * bindings. It can be removed once we have a prober DMA controller

	 * framework for DT.

		 * This is a dirty hack to make this driver work from

		 * devicetree bindings. It can be removed once we have

		 * a prober DMA controller framework for DT.

		 */

	if (pdev->dev.of_node && of_machine_is_compatible("marvell,pxa3xx")) {

		if (pdev->dev.of_node &&

		    of_machine_is_compatible("marvell,pxa3xx")) {

			info->drcmr_dat = 97;

			info->drcmr_cmd = 99;

		} else {

			r = platform_get_resource(pdev, IORESOURCE_DMA, 0);

			if (r == NULL) {

			dev_err(&pdev->dev, "no resource defined for data DMA\n");

				dev_err(&pdev->dev,

					"no resource defined for data DMA\n");

				ret = -ENXIO;

				goto fail_disable_clk;

			}
@@ -1160,12 +1163,14 @@ static int alloc_nand_resource(struct platform_device *pdev) 


			r = platform_get_resource(pdev, IORESOURCE_DMA, 1);

			if (r == NULL) {

			dev_err(&pdev->dev, "no resource defined for command DMA\n");

				dev_err(&pdev->dev,

					"no resource defined for cmd DMA\n");

				ret = -ENXIO;

				goto fail_disable_clk;

			}

			info->drcmr_cmd = r->start;

		}

	}



	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {