Skip to content

Commit 8e75ab9

Browse files
vinodkoulvinodkoul
committed
Merge branch 'topic/renesas' into for-linus
2 parents bfda902 + 97d49c5 commit 8e75ab9

File tree

12 files changed

+14
-38
lines changed

12 files changed

+14
-38
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Required Properties:
1717
- compatible: "renesas,dmac-<soctype>", "renesas,rcar-dmac" as fallback.
1818
Examples with soctypes are:
1919
- "renesas,dmac-r8a7743" (RZ/G1M)
20+
- "renesas,dmac-r8a7744" (RZ/G1N)
2021
- "renesas,dmac-r8a7745" (RZ/G1E)
2122
- "renesas,dmac-r8a77470" (RZ/G1C)
2223
- "renesas,dmac-r8a7790" (R-Car H2)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Required Properties:
44
-compatible: "renesas,<soctype>-usb-dmac", "renesas,usb-dmac" as fallback.
55
Examples with soctypes are:
66
- "renesas,r8a7743-usb-dmac" (RZ/G1M)
7+
- "renesas,r8a7744-usb-dmac" (RZ/G1N)
78
- "renesas,r8a7745-usb-dmac" (RZ/G1E)
89
- "renesas,r8a7790-usb-dmac" (R-Car H2)
910
- "renesas,r8a7791-usb-dmac" (R-Car M2-W)

‎drivers/dma/nbpfaxi.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1+
// SPDX-License-Identifier: GPL-2.0
12
/*
23
* Copyright (C) 2013-2014 Renesas Electronics Europe Ltd.
34
* Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
4-
*
5-
* This program is free software; you can redistribute it and/or modify
6-
* it under the terms of version 2 of the GNU General Public License as
7-
* published by the Free Software Foundation.
85
*/
96

107
#include <linux/bitmap.h>

‎drivers/dma/sh/rcar-dmac.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ struct rcar_dmac {
198198
struct dma_device engine;
199199
struct device *dev;
200200
void __iomem *iomem;
201+
struct device_dma_parameters parms;
201202

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

17931794
dmac->dev = &pdev->dev;
17941795
platform_set_drvdata(pdev, dmac);
1796+
dmac->dev->dma_parms = &dmac->parms;
1797+
dma_set_max_seg_size(dmac->dev, RCAR_DMATCR_MASK);
17951798
dma_set_mask_and_coherent(dmac->dev, DMA_BIT_MASK(40));
17961799

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

‎drivers/dma/sh/shdma-arm.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
12
/*
23
* Renesas SuperH DMA Engine support
34
*
45
* Copyright (C) 2013 Renesas Electronics, Inc.
5-
*
6-
* This is free software; you can redistribute it and/or modify it under the
7-
* terms of version 2 the GNU General Public License as published by the Free
8-
* Software Foundation.
96
*/
107

118
#ifndef SHDMA_ARM_H

‎drivers/dma/sh/shdma-base.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// SPDX-License-Identifier: GPL-2.0
12
/*
23
* Dmaengine driver base library for DMA controllers, found on SH-based SoCs
34
*
@@ -7,10 +8,6 @@
78
* Copyright (C) 2009 Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
89
* Copyright (C) 2009 Renesas Solutions, Inc. All rights reserved.
910
* Copyright (C) 2007 Freescale Semiconductor, Inc. All rights reserved.
10-
*
11-
* This is free software; you can redistribute it and/or modify
12-
* it under the terms of version 2 of the GNU General Public License as
13-
* published by the Free Software Foundation.
1411
*/
1512

1613
#include <linux/delay.h>

‎drivers/dma/sh/shdma-of.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1+
// SPDX-License-Identifier: GPL-2.0
12
/*
23
* SHDMA Device Tree glue
34
*
45
* Copyright (C) 2013 Renesas Electronics Inc.
56
* Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
6-
*
7-
* This is free software; you can redistribute it and/or modify
8-
* it under the terms of version 2 of the GNU General Public License as
9-
* published by the Free Software Foundation.
107
*/
118

129
#include <linux/dmaengine.h>

‎drivers/dma/sh/shdma-r8a73a4.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1+
// SPDX-License-Identifier: GPL-2.0
12
/*
23
* Renesas SuperH DMA Engine support for r8a73a4 (APE6) SoCs
34
*
45
* Copyright (C) 2013 Renesas Electronics, Inc.
5-
*
6-
* This is free software; you can redistribute it and/or modify it under the
7-
* terms of version 2 the GNU General Public License as published by the Free
8-
* Software Foundation.
96
*/
107
#include <linux/sh_dma.h>
118

‎drivers/dma/sh/shdma.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1+
/* SPDX-License-Identifier: GPL-2.0+ */
12
/*
23
* Renesas SuperH DMA Engine support
34
*
45
* Copyright (C) 2009 Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
56
* Copyright (C) 2009 Renesas Solutions, Inc. All rights reserved.
67
*
7-
* This is free software; you can redistribute it and/or modify
8-
* it under the terms of the GNU General Public License as published by
9-
* the Free Software Foundation; either version 2 of the License, or
10-
* (at your option) any later version.
11-
*
128
*/
139
#ifndef __DMA_SHDMA_H
1410
#define __DMA_SHDMA_H

‎drivers/dma/sh/shdmac.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// SPDX-License-Identifier: GPL-2.0+
12
/*
23
* Renesas SuperH DMA Engine support
34
*
@@ -8,11 +9,6 @@
89
* Copyright (C) 2009 Renesas Solutions, Inc. All rights reserved.
910
* Copyright (C) 2007 Freescale Semiconductor, Inc. All rights reserved.
1011
*
11-
* This is free software; you can redistribute it and/or modify
12-
* it under the terms of the GNU General Public License as published by
13-
* the Free Software Foundation; either version 2 of the License, or
14-
* (at your option) any later version.
15-
*
1612
* - DMA of SuperH does not have Hardware DMA chain mode.
1713
* - MAX DMA size is 16MB.
1814
*

0 commit comments

Comments
 (0)