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

Commit 3a7b854d authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/renesas' into for-linus

parents 477e0f90 a0b007e1

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

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ Required Properties: 
	      Examples with soctypes are:

		- "renesas,dmac-r8a7743" (RZ/G1M)

		- "renesas,dmac-r8a7745" (RZ/G1E)

		- "renesas,dmac-r8a77470" (RZ/G1C)

		- "renesas,dmac-r8a7790" (R-Car H2)

		- "renesas,dmac-r8a7791" (R-Car M2-W)

		- "renesas,dmac-r8a7792" (R-Car V2H)
@@ -26,6 +27,7 @@ Required Properties: 
		- "renesas,dmac-r8a7795" (R-Car H3)

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

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

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



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

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

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ Required Properties: 
	  - "renesas,r8a7794-usb-dmac" (R-Car E2)

	  - "renesas,r8a7795-usb-dmac" (R-Car H3)

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

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

- 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/rcar-dmac.c

+11 −2
Original line number Diff line number Diff line
@@ -1301,8 +1301,17 @@ static unsigned int rcar_dmac_chan_get_residue(struct rcar_dmac_chan *chan, 
	 * If the cookie doesn't correspond to the currently running transfer

	 * then the descriptor hasn't been processed yet, and the residue is

	 * equal to the full descriptor size.

	 * Also, a client driver is possible to call this function before

	 * rcar_dmac_isr_channel_thread() runs. In this case, the "desc.running"

	 * will be the next descriptor, and the done list will appear. So, if

	 * the argument cookie matches the done list's cookie, we can assume

	 * the residue is zero.

	 */

	if (cookie != desc->async_tx.cookie) {

		list_for_each_entry(desc, &chan->desc.done, node) {

			if (cookie == desc->async_tx.cookie)

				return 0;

		}

		list_for_each_entry(desc, &chan->desc.pending, node) {

			if (cookie == desc->async_tx.cookie)

				return desc->size;
@@ -1677,7 +1686,7 @@ static const struct dev_pm_ops rcar_dmac_pm = { 
	 *   - Wait for the current transfer to complete and stop the device,

	 *   - Resume transfers, if any.

	 */

	SET_LATE_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,

	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,

				      pm_runtime_force_resume)

	SET_RUNTIME_PM_OPS(rcar_dmac_runtime_suspend, rcar_dmac_runtime_resume,

			   NULL)