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

Commit 8e75ab9b authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/renesas' into for-linus

parents bfda9020 97d49c59

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

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ Required Properties: 
- compatible: "renesas,dmac-<soctype>", "renesas,rcar-dmac" as fallback.

	      Examples with soctypes are:

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

		- "renesas,dmac-r8a7744" (RZ/G1N)

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

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

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

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

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ Required Properties: 
-compatible: "renesas,<soctype>-usb-dmac", "renesas,usb-dmac" as fallback.

	Examples with soctypes are:

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

	  - "renesas,r8a7744-usb-dmac" (RZ/G1N)

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

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

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

drivers/dma/nbpfaxi.c

+1 −4
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (C) 2013-2014 Renesas Electronics Europe Ltd.

 * Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as

 * published by the Free Software Foundation.

 */



#include <linux/bitmap.h>

drivers/dma/sh/rcar-dmac.c

+3 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ struct rcar_dmac { 
	struct dma_device engine;

	struct device *dev;

	void __iomem *iomem;

	struct device_dma_parameters parms;



	unsigned int n_channels;

	struct rcar_dmac_chan *channels;
@@ -1792,6 +1793,8 @@ static int rcar_dmac_probe(struct platform_device *pdev) 


	dmac->dev = &pdev->dev;

	platform_set_drvdata(pdev, dmac);

	dmac->dev->dma_parms = &dmac->parms;

	dma_set_max_seg_size(dmac->dev, RCAR_DMATCR_MASK);

	dma_set_mask_and_coherent(dmac->dev, DMA_BIT_MASK(40));



	ret = rcar_dmac_parse_of(&pdev->dev, dmac);

drivers/dma/sh/shdma-arm.h

+1 −4
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Renesas SuperH DMA Engine support

 *

 * Copyright (C) 2013 Renesas Electronics, Inc.

 *

 * This is free software; you can redistribute it and/or modify it under the

 * terms of version 2 the GNU General Public License as published by the Free

 * Software Foundation.

 */



#ifndef SHDMA_ARM_H