Commit d39dae11 authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/renesas' into for-linus

parents e6f81f3c 6fc1d18e

Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ Required Properties: 
		- "renesas,dmac-r8a7796" (R-Car M3-W)

		- "renesas,dmac-r8a77970" (R-Car V3M)

		- "renesas,dmac-r8a77980" (R-Car V3H)

		- "renesas,dmac-r8a77995" (R-Car D3)



- reg: base address and length of the registers block for the DMAC

Documentation/devicetree/bindings/dma/renesas,usb-dmac.txt

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ Required Properties: 
	  - "renesas,r8a7795-usb-dmac" (R-Car H3)

	  - "renesas,r8a7796-usb-dmac" (R-Car M3-W)

	  - "renesas,r8a77965-usb-dmac" (R-Car M3-N)

	  - "renesas,r8a77990-usb-dmac" (R-Car E3)

	  - "renesas,r8a77995-usb-dmac" (R-Car D3)

- reg: base address and length of the registers block for the DMAC

- interrupts: interrupt specifiers for the DMAC, one for each entry in

  interrupt-names.

drivers/dma/sh/shdmac.c

+21 −29
Original line number Diff line number Diff line
@@ -443,7 +443,6 @@ static bool sh_dmae_reset(struct sh_dmae_device *shdev) 
	return ret;

}



#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE)

static irqreturn_t sh_dmae_err(int irq, void *data)

{

	struct sh_dmae_device *shdev = data;
@@ -454,7 +453,6 @@ static irqreturn_t sh_dmae_err(int irq, void *data) 
	sh_dmae_reset(shdev);

	return IRQ_HANDLED;

}

#endif



static bool sh_dmae_desc_completed(struct shdma_chan *schan,

				   struct shdma_desc *sdesc)
@@ -686,11 +684,8 @@ static int sh_dmae_probe(struct platform_device *pdev) 
	const struct sh_dmae_pdata *pdata;

	unsigned long chan_flag[SH_DMAE_MAX_CHANNELS] = {};

	int chan_irq[SH_DMAE_MAX_CHANNELS];

#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE)

	unsigned long irqflags = 0;

	int errirq;

#endif

	int err, i, irq_cnt = 0, irqres = 0, irq_cap = 0;

	int err, errirq, i, irq_cnt = 0, irqres = 0, irq_cap = 0;

	struct sh_dmae_device *shdev;

	struct dma_device *dma_dev;

	struct resource *chan, *dmars, *errirq_res, *chanirq_res;
@@ -792,7 +787,7 @@ static int sh_dmae_probe(struct platform_device *pdev) 
	if (err)

		goto rst_err;



#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE)

	if (IS_ENABLED(CONFIG_CPU_SH4) || IS_ENABLED(CONFIG_ARCH_RENESAS)) {

		chanirq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 1);



		if (!chanirq_res)
@@ -806,18 +801,17 @@ static int sh_dmae_probe(struct platform_device *pdev) 


		errirq = errirq_res->start;



	err = devm_request_irq(&pdev->dev, errirq, sh_dmae_err, irqflags,

			       "DMAC Address Error", shdev);

		err = devm_request_irq(&pdev->dev, errirq, sh_dmae_err,

				       irqflags, "DMAC Address Error", shdev);

		if (err) {

			dev_err(&pdev->dev,

				"DMA failed requesting irq #%d, error %d\n",

				errirq, err);

			goto eirq_err;

		}



#else

	} else {

		chanirq_res = errirq_res;

#endif /* CONFIG_CPU_SH4 || CONFIG_ARCH_SHMOBILE */

	}



	if (chanirq_res->start == chanirq_res->end &&

	    !platform_get_resource(pdev, IORESOURCE_IRQ, 1)) {
@@ -884,9 +878,7 @@ static int sh_dmae_probe(struct platform_device *pdev) 
chan_probe_err:

	sh_dmae_chan_remove(shdev);



#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE)

eirq_err:

#endif

rst_err:

	spin_lock_irq(&sh_dmae_lock);

	list_del_rcu(&shdev->node);